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

Remove a should have been deleted extra assignment to a variable. 

Also fix up the formatting a bit, it looks like something was inserting
actual tabs.  Replace with 4 spaces.

llvm-svn: 270148
This commit is contained in:
Jim Ingham 2016-05-19 22:22:57 +00:00
parent ab03eb007c
commit d9e02c4f3c
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lldb/source/Target/ThreadPlanShouldStopHere.cpp
View File

@ -120,38 +120,38 @@ ThreadPlanShouldStopHere::DefaultStepFromHereCallback (ThreadPlan *current_plan,
if (!frame) if (!frame)
return return_plan_sp; return return_plan_sp;
SymbolContext sc; SymbolContext sc;
sc = frame->GetSymbolContext (eSymbolContextLineEntry);
sc = frame->GetSymbolContext (eSymbolContextLineEntry|eSymbolContextSymbol); sc = frame->GetSymbolContext (eSymbolContextLineEntry|eSymbolContextSymbol);
if (sc.line_entry.line == 0) if (sc.line_entry.line == 0)
{ {
AddressRange range = sc.line_entry.range; AddressRange range = sc.line_entry.range;
// If the whole function is marked line 0 just step out, that's easier & faster than continuing // If the whole function is marked line 0 just step out, that's easier & faster than continuing
// to step through it. // to step through it.
bool just_step_out = false; bool just_step_out = false;
if (sc.symbol && sc.symbol->ValueIsAddress()) if (sc.symbol && sc.symbol->ValueIsAddress())
{ {
Address symbol_end = sc.symbol->GetAddress(); Address symbol_end = sc.symbol->GetAddress();
symbol_end.Slide(sc.symbol->GetByteSize() - 1); symbol_end.Slide(sc.symbol->GetByteSize() - 1);
if (range.ContainsFileAddress(sc.symbol->GetAddress()) && range.ContainsFileAddress(symbol_end)) if (range.ContainsFileAddress(sc.symbol->GetAddress()) && range.ContainsFileAddress(symbol_end))
{ {
if (log) if (log)
log->Printf("Stopped in a function with only line 0 lines, just stepping out."); log->Printf("Stopped in a function with only line 0 lines, just stepping out.");
just_step_out = true; just_step_out = true;
}
} }
}
if (!just_step_out) if (!just_step_out)
{ {
if (log) if (log)
log->Printf ("ThreadPlanShouldStopHere::DefaultStepFromHereCallback Queueing StepInRange plan to step through line 0 code."); log->Printf ("ThreadPlanShouldStopHere::DefaultStepFromHereCallback Queueing StepInRange plan to step through line 0 code.");
return_plan_sp = current_plan->GetThread().QueueThreadPlanForStepInRange(false, return_plan_sp = current_plan->GetThread().QueueThreadPlanForStepInRange(false,
range, range,
sc, sc,
NULL, NULL,
eOnlyDuringStepping, eOnlyDuringStepping,
eLazyBoolCalculate, eLazyBoolCalculate,
eLazyBoolNo); eLazyBoolNo);
} }
} }