maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Refine the fix in r187094 to only distrust the StackID comparision when we are starting from an address with no symbols. 

If we don't do that "nexti" will stop too soon when stepping past a tail call jump.

rdar://problem/14516227

llvm-svn: 187173
This commit is contained in:
Jim Ingham 2013-07-26 00:27:57 +00:00
parent ab09187553
commit a7d4822c75
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lldb/include/lldb/Target/ThreadPlanStepInstruction.h
View File

@ -50,6 +50,7 @@ private:
bool m_stop_other_threads;
bool m_step_over;
// These two are used only for the step over case.
bool m_start_has_symbol;
StackID m_stack_id;
StackID m_parent_frame_id;

13
lldb/source/Target/ThreadPlanStepInstruction.cpp
View File

@ -44,7 +44,11 @@ ThreadPlanStepInstruction::ThreadPlanStepInstruction
m_step_over (step_over)
{
m_instruction_addr = m_thread.GetRegisterContext()->GetPC(0);
m_stack_id = m_thread.GetStackFrameAtIndex(0)->GetStackID();
StackFrameSP m_start_frame_sp(m_thread.GetStackFrameAtIndex(0));
m_stack_id = m_start_frame_sp->GetStackID();
m_start_has_symbol = m_start_frame_sp->GetSymbolContext(eSymbolContextSymbol).symbol != NULL;
StackFrameSP parent_frame_sp = m_thread.GetStackFrameAtIndex(1);
if (parent_frame_sp)
m_parent_frame_id = parent_frame_sp->GetStackID();
@ -68,6 +72,9 @@ ThreadPlanStepInstruction::GetDescription (Stream *s, lldb::DescriptionLevel lev
{
s->Printf ("Stepping one instruction past ");
s->Address(m_instruction_addr, sizeof (addr_t));
if (!m_start_has_symbol)
s->Printf(" which has no symbol");
if (m_step_over)
s->Printf(" stepping over calls");
else
@ -123,7 +130,7 @@ ThreadPlanStepInstruction::ShouldStop (Event *event_ptr)
StackFrame *return_frame = m_thread.GetStackFrameAtIndex(1).get();
if (return_frame)
{
if (return_frame->GetStackID() != m_parent_frame_id)
if (return_frame->GetStackID() != m_parent_frame_id || m_start_has_symbol)
{
if (log)
{
@ -153,7 +160,7 @@ ThreadPlanStepInstruction::ShouldStop (Event *event_ptr)
{
if (log)
{
log->PutCString("The stack id we are stepping in changed, but our parent frame did not. "
log->PutCString("The stack id we are stepping in changed, but our parent frame did not when stepping from code with no symbols. "
"We are probably just confused about where we are, stopping.");
}
SetPlanComplete();