Don't duplicate the logic of the ThreadPlanShouldStopHere::DefaultShouldStopHereCallback

in the ThreadPlanStepInRange's implementation, just call it...

llvm-svn: 215178

1 files changed, 4 insertions, 12 deletions

diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp
index 35826ec16d0..3e9abef6557 100644
--- a/lldb/source/Target/ThreadPlanStepInRange.cpp
+++ b/lldb/source/Target/ThreadPlanStepInRange.cpp
@@ -401,18 +401,10 @@ ThreadPlanStepInRange::DefaultShouldStopHereCallback (ThreadPlan *current_plan,
     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)
     {