caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When stepping, handle the case where the step leaves us with

Browse Source 
the same parent frame, but different current frame - e.g. when
you step past a tail call exit from a function.  Apply the same
"avoid-no-debug" rules to this case as for a "step-in".

<rdar://problem/16189225>

llvm-svn: 214946
This commit is contained in:
Jim Ingham
2014-08-06 01:49:59 +00:00
parent 515c24b7e0
commit 862d1bbdf6
6 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lldb/source/Target/ThreadPlanStepRange.cpp
View File

@@ -50,6 +50,7 @@ ThreadPlanStepRange::ThreadPlanStepRange (ThreadPlanKind kind,
m_address_ranges (),
m_stop_others (stop_others),
m_stack_id (),
m_parent_stack_id(),
m_no_more_plans (false),
m_first_run_event (true),
m_use_fast_step(false)
@@ -57,6 +58,7 @@ ThreadPlanStepRange::ThreadPlanStepRange (ThreadPlanKind kind,
m_use_fast_step = GetTarget().GetUseFastStepping();
AddRange(range);
m_stack_id = m_thread.GetStackFrameAtIndex(0)->GetStackID();
m_parent_stack_id = m_thread.GetStackFrameAtIndex(1)->GetStackID();
}
ThreadPlanStepRange::~ThreadPlanStepRange ()
@@ -270,7 +272,13 @@ ThreadPlanStepRange::CompareCurrentFrameToStartFrame()
}
else
{
frame_order = eFrameCompareOlder;
StackID cur_parent_id = m_thread.GetStackFrameAtIndex(1)->GetStackID();
if (m_parent_stack_id.IsValid()
&& cur_parent_id.IsValid()
&& m_parent_stack_id == cur_parent_id)
frame_order = eFrameCompareSameParent;
else
frame_order = eFrameCompareOlder;
}
return frame_order;
}