summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2018-06-26 23:38:58 +0000
committerJim Ingham <jingham@apple.com>2018-06-26 23:38:58 +0000
commitb87b9e6a83eeb0bac54f159ec93b30d7ff9d7a32 (patch)
tree73bba17b7530f02de52bf8b299d530b0487f4259
parentd6cbdc3767c30b2f6e74c0856872f21649cffa03 (diff)
downloadbcm5719-llvm-b87b9e6a83eeb0bac54f159ec93b30d7ff9d7a32.tar.gz
bcm5719-llvm-b87b9e6a83eeb0bac54f159ec93b30d7ff9d7a32.zip
The Process class ivar ivar was changed to a weak pointer, but was still _sp.
Fix that to _wp. llvm-svn: 335689
-rw-r--r--lldb/include/lldb/Target/Process.h6
-rw-r--r--lldb/source/Target/Process.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index 71ea3647bd9..684e30f7091 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -1461,7 +1461,7 @@ public:
/// A Target object pointer to the target that owns this
/// module.
//------------------------------------------------------------------
- Target &GetTarget() { return *m_target_sp.lock(); }
+ Target &GetTarget() { return *m_target_wp.lock(); }
//------------------------------------------------------------------
/// Get the const target object pointer for this module.
@@ -1470,7 +1470,7 @@ public:
/// A const Target object pointer to the target that owns this
/// module.
//------------------------------------------------------------------
- const Target &GetTarget() const { return *m_target_sp.lock(); }
+ const Target &GetTarget() const { return *m_target_wp.lock(); }
//------------------------------------------------------------------
/// Flush all data in the process.
@@ -2994,7 +2994,7 @@ protected:
//------------------------------------------------------------------
// Member variables
//------------------------------------------------------------------
- std::weak_ptr<Target> m_target_sp; ///< The target that owns this process.
+ std::weak_ptr<Target> m_target_wp; ///< The target that owns this process.
ThreadSafeValue<lldb::StateType> m_public_state;
ThreadSafeValue<lldb::StateType>
m_private_state; // The actual state of our process
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index a1826a77be1..c3d8abc9f78 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -725,7 +725,7 @@ Process::Process(lldb::TargetSP target_sp, ListenerSP listener_sp,
: ProcessProperties(this), UserID(LLDB_INVALID_PROCESS_ID),
Broadcaster((target_sp->GetDebugger().GetBroadcasterManager()),
Process::GetStaticBroadcasterClass().AsCString()),
- m_target_sp(target_sp), m_public_state(eStateUnloaded),
+ m_target_wp(target_sp), m_public_state(eStateUnloaded),
m_private_state(eStateUnloaded),
m_private_state_broadcaster(nullptr,
"lldb.process.internal_state_broadcaster"),
@@ -4377,7 +4377,7 @@ bool Process::ProcessEventData::SetUpdateStateOnRemoval(Event *event_ptr) {
return false;
}
-lldb::TargetSP Process::CalculateTarget() { return m_target_sp.lock(); }
+lldb::TargetSP Process::CalculateTarget() { return m_target_wp.lock(); }
void Process::CalculateExecutionContext(ExecutionContext &exe_ctx) {
exe_ctx.SetTargetPtr(&GetTarget());
OpenPOWER on IntegriCloud