From d9e02c4f3c56b3e1e064566680ed2dfcf60fa5a4 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Thu, 19 May 2016 22:22:57 +0000 Subject: [PATCH] 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 --- .../Target/ThreadPlanShouldStopHere.cpp | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lldb/source/Target/ThreadPlanShouldStopHere.cpp b/lldb/source/Target/ThreadPlanShouldStopHere.cpp index bc77c6eaaffa..fcbc7f01c901 100644 --- a/lldb/source/Target/ThreadPlanShouldStopHere.cpp +++ b/lldb/source/Target/ThreadPlanShouldStopHere.cpp @@ -120,38 +120,38 @@ ThreadPlanShouldStopHere::DefaultStepFromHereCallback (ThreadPlan *current_plan, if (!frame) return return_plan_sp; SymbolContext sc; - sc = frame->GetSymbolContext (eSymbolContextLineEntry); sc = frame->GetSymbolContext (eSymbolContextLineEntry|eSymbolContextSymbol); + if (sc.line_entry.line == 0) { 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. - bool just_step_out = false; - if (sc.symbol && sc.symbol->ValueIsAddress()) - { - Address symbol_end = sc.symbol->GetAddress(); - symbol_end.Slide(sc.symbol->GetByteSize() - 1); + bool just_step_out = false; + if (sc.symbol && sc.symbol->ValueIsAddress()) + { + Address symbol_end = sc.symbol->GetAddress(); + symbol_end.Slide(sc.symbol->GetByteSize() - 1); if (range.ContainsFileAddress(sc.symbol->GetAddress()) && range.ContainsFileAddress(symbol_end)) - { - if (log) - log->Printf("Stopped in a function with only line 0 lines, just stepping out."); + { + if (log) + log->Printf("Stopped in a function with only line 0 lines, just stepping out."); just_step_out = true; - } } + } if (!just_step_out) { - if (log) - log->Printf ("ThreadPlanShouldStopHere::DefaultStepFromHereCallback Queueing StepInRange plan to step through line 0 code."); + if (log) + log->Printf ("ThreadPlanShouldStopHere::DefaultStepFromHereCallback Queueing StepInRange plan to step through line 0 code."); - return_plan_sp = current_plan->GetThread().QueueThreadPlanForStepInRange(false, - range, - sc, - NULL, - eOnlyDuringStepping, - eLazyBoolCalculate, - eLazyBoolNo); + return_plan_sp = current_plan->GetThread().QueueThreadPlanForStepInRange(false, + range, + sc, + NULL, + eOnlyDuringStepping, + eLazyBoolCalculate, + eLazyBoolNo); } }