replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The Process class ivar ivar was changed to a weak pointer, but was still _sp. 

Fix that to _wp.

llvm-svn: 335689
This commit is contained in:
Jim Ingham 2018-06-26 23:38:58 +00:00
parent d6cbdc3767
commit b87b9e6a83
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/include/lldb/Target/Process.h
View File

@ -1461,7 +1461,7 @@ public:
/// A Target object pointer to the target that owns this /// A Target object pointer to the target that owns this
/// module. /// module.
//------------------------------------------------------------------ //------------------------------------------------------------------
Target &GetTarget() { return *m_target_sp.lock(); } Target &GetTarget() { return *m_target_wp.lock(); }
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Get the const target object pointer for this module. /// 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 /// A const Target object pointer to the target that owns this
/// module. /// 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. /// Flush all data in the process.
@ -2994,7 +2994,7 @@ protected:
//------------------------------------------------------------------ //------------------------------------------------------------------
// Member variables // 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_public_state;
ThreadSafeValue<lldb::StateType> ThreadSafeValue<lldb::StateType>
m_private_state; // The actual state of our process m_private_state; // The actual state of our process

4
lldb/source/Target/Process.cpp
View File

@ -725,7 +725,7 @@ Process::Process(lldb::TargetSP target_sp, ListenerSP listener_sp,
: ProcessProperties(this), UserID(LLDB_INVALID_PROCESS_ID), : ProcessProperties(this), UserID(LLDB_INVALID_PROCESS_ID),
Broadcaster((target_sp->GetDebugger().GetBroadcasterManager()), Broadcaster((target_sp->GetDebugger().GetBroadcasterManager()),
Process::GetStaticBroadcasterClass().AsCString()), 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(eStateUnloaded),
m_private_state_broadcaster(nullptr, m_private_state_broadcaster(nullptr,
"lldb.process.internal_state_broadcaster"), "lldb.process.internal_state_broadcaster"),
@ -4377,7 +4377,7 @@ bool Process::ProcessEventData::SetUpdateStateOnRemoval(Event *event_ptr) {
return false; 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) { void Process::CalculateExecutionContext(ExecutionContext &exe_ctx) {
exe_ctx.SetTargetPtr(&GetTarget()); exe_ctx.SetTargetPtr(&GetTarget());