diff options
| author | Jim Ingham <jingham@apple.com> | 2012-07-26 18:23:21 +0000 |
|---|---|---|
| committer | Jim Ingham <jingham@apple.com> | 2012-07-26 18:23:21 +0000 |
| commit | 5f1a4e1ff3ad5a716c63eac6d1baf8fafdfc76ba (patch) | |
| tree | 569a4608957bdd85c6b5554ab518e1d0fc3fb6d7 /lldb/source/Target/ThreadPlanStepOut.cpp | |
| parent | 0b3d782933c23838618501c076f77e9ce909fae7 (diff) | |
| download | bcm5719-llvm-5f1a4e1ff3ad5a716c63eac6d1baf8fafdfc76ba.tar.gz bcm5719-llvm-5f1a4e1ff3ad5a716c63eac6d1baf8fafdfc76ba.zip | |
Relax the test for "is the frame I am going to step back out to the one I started from" in ThreadPlanStepOverRange so you don't
artificially reject stepping out of a function you stepped into when stepping through an inlined range.
Also fill in the target in the symbol context we make up for the inlined stepping range in ThreadPlanStepOut.
<rdar://problem/11765912>
llvm-svn: 160794
Diffstat (limited to 'lldb/source/Target/ThreadPlanStepOut.cpp')
| -rw-r--r-- | lldb/source/Target/ThreadPlanStepOut.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp index 3687f9aca25..9b0e3204008 100644 --- a/lldb/source/Target/ThreadPlanStepOut.cpp +++ b/lldb/source/Target/ThreadPlanStepOut.cpp @@ -415,6 +415,7 @@ ThreadPlanStepOut::QueueInlinedStepPlan (bool queue_now) { SymbolContext inlined_sc; inlined_block->CalculateSymbolContext(&inlined_sc); + inlined_sc.target_sp = GetTarget().shared_from_this(); RunMode run_mode = m_stop_others ? lldb::eOnlyThisThread : lldb::eAllThreads; ThreadPlanStepOverRange *step_through_inline_plan_ptr = new ThreadPlanStepOverRange(m_thread, inline_range, |
