From 653e3f4e197d6d27710f09366bf9542ea617594f Mon Sep 17 00:00:00 2001 From: Todd Fiala Date: Fri, 11 Nov 2016 21:06:40 +0000 Subject: [PATCH] Remove weak-linked symbols for SBBreakpointListImpl Summary: Similar to SBStructuredData's Impl class, SBBreakpointListImpl was getting weak-link exported in the lldb namespace. This change list fixes that by moving out of the lldb public namespace, which removes it from public export visibility. Fixes: rdar://28960344 Reviewers: jingham Subscribers: lldb-commits Differential Revision: https://reviews.llvm.org/D26553 llvm-svn: 286631 --- lldb/include/lldb/API/SBBreakpoint.h | 4 ++-- lldb/include/lldb/API/SBTarget.h | 2 +- lldb/source/API/SBBreakpoint.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lldb/include/lldb/API/SBBreakpoint.h b/lldb/include/lldb/API/SBBreakpoint.h index 7924229..56509c9 100644 --- a/lldb/include/lldb/API/SBBreakpoint.h +++ b/lldb/include/lldb/API/SBBreakpoint.h @@ -12,6 +12,8 @@ #include "lldb/API/SBDefines.h" +class SBBreakpointListImpl; + namespace lldb { class LLDB_API SBBreakpoint { @@ -146,8 +148,6 @@ private: lldb::BreakpointSP m_opaque_sp; }; -class SBBreakpointListImpl; - class LLDB_API SBBreakpointList { public: SBBreakpointList(SBTarget &target); diff --git a/lldb/include/lldb/API/SBTarget.h b/lldb/include/lldb/API/SBTarget.h index a4503ae..4e8db83 100644 --- a/lldb/include/lldb/API/SBTarget.h +++ b/lldb/include/lldb/API/SBTarget.h @@ -819,7 +819,7 @@ public: protected: friend class SBAddress; friend class SBBlock; - friend class SBBreakpointListImpl; + friend class SBBreakpointList; friend class SBDebugger; friend class SBExecutionContext; friend class SBFunction; diff --git a/lldb/source/API/SBBreakpoint.cpp b/lldb/source/API/SBBreakpoint.cpp index 8b05156..0eab2c2 100644 --- a/lldb/source/API/SBBreakpoint.cpp +++ b/lldb/source/API/SBBreakpoint.cpp @@ -712,11 +712,11 @@ SBBreakpoint::GetNumBreakpointLocationsFromEvent(const lldb::SBEvent &event) { } // This is simple collection of breakpoint id's and their target. -class lldb::SBBreakpointListImpl { +class SBBreakpointListImpl { public: - SBBreakpointListImpl(SBTarget &target) : m_target_wp() { - if (target.IsValid()) - m_target_wp = target.GetSP(); + SBBreakpointListImpl(lldb::TargetSP target_sp) : m_target_wp() { + if (target_sp && target_sp->IsValid()) + m_target_wp = target_sp; } ~SBBreakpointListImpl() = default; @@ -796,7 +796,7 @@ private: }; SBBreakpointList::SBBreakpointList(SBTarget &target) - : m_opaque_sp(new lldb::SBBreakpointListImpl(target)) {} + : m_opaque_sp(new SBBreakpointListImpl(target.GetSP())) {} SBBreakpointList::~SBBreakpointList() {} -- 2.7.4