summaryrefslogtreecommitdiffstats
path: root/lldb/source/Target/ThreadPlanStepInRange.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2012-02-18 05:35:26 +0000
committerGreg Clayton <gclayton@apple.com>2012-02-18 05:35:26 +0000
commitd9e416c0ea61c13440e99fdab86e44c6e71a8eff (patch)
tree7cdcdc10fb941cb0658a5a651a5f6ceb2cd40e63 /lldb/source/Target/ThreadPlanStepInRange.cpp
parent0dea49e324ecb836ddad859495bde8ffc48a8ae0 (diff)
downloadbcm5719-llvm-d9e416c0ea61c13440e99fdab86e44c6e71a8eff.tar.gz
bcm5719-llvm-d9e416c0ea61c13440e99fdab86e44c6e71a8eff.zip
The second part in thread hardening the internals of LLDB where we make
the lldb_private::StackFrame objects hold onto a weak pointer to the thread object. The lldb_private::StackFrame objects the the most volatile objects we have as when we are doing single stepping, frames can often get lost or thrown away, only to be re-created as another object that still refers to the same frame. We have another bug tracking that. But we need to be able to have frames no longer be able to get the thread when they are not part of a thread anymore, and this is the first step (this fix makes that possible but doesn't implement it yet). Also changed lldb_private::ExecutionContextScope to return shared pointers to all objects in the execution context to further thread harden the internals. llvm-svn: 150871
Diffstat (limited to 'lldb/source/Target/ThreadPlanStepInRange.cpp')
-rw-r--r--lldb/source/Target/ThreadPlanStepInRange.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp
index b1c1bbc1d61..3455e908d0f 100644
--- a/lldb/source/Target/ThreadPlanStepInRange.cpp
+++ b/lldb/source/Target/ThreadPlanStepInRange.cpp
@@ -194,13 +194,13 @@ ThreadPlanStepInRange::ShouldStop (Event *event_ptr)
if (sc.function)
{
func_start_address = sc.function->GetAddressRange().GetBaseAddress();
- if (curr_addr == func_start_address.GetLoadAddress(m_thread.CalculateTarget()))
+ if (curr_addr == func_start_address.GetLoadAddress(m_thread.CalculateTarget().get()))
bytes_to_skip = sc.function->GetPrologueByteSize();
}
else if (sc.symbol)
{
func_start_address = sc.symbol->GetValue();
- if (curr_addr == func_start_address.GetLoadAddress(m_thread.CalculateTarget()))
+ if (curr_addr == func_start_address.GetLoadAddress(m_thread.CalculateTarget().get()))
bytes_to_skip = sc.symbol->GetPrologueByteSize();
}
OpenPOWER on IntegriCloud