[Lldb-commits] [lldb] r215178 - Don't duplicate the logic of the ThreadPlanShouldStopHere::DefaultShouldStopHereCallback

[Jim Ingham]

Author: jingham
Date: Thu Aug  7 20:27:01 2014
New Revision: 215178

URL: http://llvm.org/viewvc/llvm-project?rev=215178&view=rev
Log:
Don't duplicate the logic of the ThreadPlanShouldStopHere::DefaultShouldStopHereCallback
in the ThreadPlanStepInRange's implementation, just call it...

Modified:
    lldb/trunk/source/Target/ThreadPlanStepInRange.cpp

Modified: lldb/trunk/source/Target/ThreadPlanStepInRange.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/ThreadPlanStepInRange.cpp?rev=215178&r1=215177&r2=215178&view=diff
==============================================================================
--- lldb/trunk/source/Target/ThreadPlanStepInRange.cpp (original)
+++ lldb/trunk/source/Target/ThreadPlanStepInRange.cpp Thu Aug  7 20:27:01 2014
@@ -401,18 +401,10 @@ ThreadPlanStepInRange::DefaultShouldStop
     StackFrame *frame = current_plan->GetThread().GetStackFrameAtIndex(0).get();
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
 
-    if ((operation == eFrameCompareYounger && flags.Test(eStepInAvoidNoDebug))
-        || (operation == eFrameCompareSameParent && flags.Test(eStepOutAvoidNoDebug))
-        || (operation == eFrameCompareOlder && flags.Test(eStepOutAvoidNoDebug)))
-    {
-        if (!frame->HasDebugInformation())
-        {
-            if (log)
-                log->Printf ("Stepping out of frame with no debug info");
-
-            should_stop_here = false;
-        }
-    }
+    // First see if the ThreadPlanShouldStopHere default implementation thinks we should get out of here:
+    should_stop_here = ThreadPlanShouldStopHere::DefaultShouldStopHereCallback (current_plan, flags, operation, baton);
+    if (!should_stop_here)
+        return should_stop_here;
     
     if (should_stop_here && current_plan->GetKind() == eKindStepInRange && operation == eFrameCompareYounger)
     {