Merge pull request #10407 from felipepiovezan/felipe/repl_simplification

[lldb][NFC] Reduce scope of Swift customizations

Author: felipepiovezan

lldb/source/Target/Process.cpp

@@ -782,6 +782,69 @@ BreakpointSiteMatchesREPLBreakpoint(const BreakpointSiteSP &bp_site_sp) {
   return false;
 }
 
+/// Returns true if reason is Trace/Breakpoint/Watchpoint/PlanComplete.
+static bool IsDebuggerCausedStop(StopReason reason) {
+  switch (reason) {
+  case eStopReasonInvalid:
+  case eStopReasonNone:
+  case eStopReasonSignal:
+  case eStopReasonException:
+  case eStopReasonExec:
+  case eStopReasonFork:
+  case eStopReasonVFork:
+  case eStopReasonVForkDone:
+  case eStopReasonThreadExiting:
+  case eStopReasonInstrumentation:
+  case eStopReasonProcessorTrace:
+    return false;
+
+  case eStopReasonTrace:
+  case eStopReasonBreakpoint:
+  case eStopReasonWatchpoint:
+  case eStopReasonPlanComplete:
+    return true;
+  }
+  return false;
+}
+
+/// Returns true if any thread in thread_list has a stop reason of
+/// Trace/Breakpoint/Watchpoint/PlanComplete.
+static bool AnyDebuggerCausedStop(ThreadList &thread_list) {
+  for (const auto &thread_sp : thread_list.Threads()) {
+    if (!thread_sp)
+      continue;
+    StopReason stop_reason = thread_sp->GetStopReason();
+    if (IsDebuggerCausedStop(stop_reason))
+      return true;
+  }
+  return false;
+}
+
+/// Returns true if curr_thread is not null and it is stopped at a REPL
+/// breakpoint.
+static bool IsREPLBreakpoint(Thread *curr_thread) {
+  if (!curr_thread)
+    return false;
+
+  Process &process = *curr_thread->GetProcess();
+
+  if (StopInfoSP stop_info_sp = curr_thread->GetStopInfo())
+    if (BreakpointSiteSP bp_site_sp =
+            process.GetBreakpointSiteList().FindByID(stop_info_sp->GetValue()))
+      return BreakpointSiteMatchesREPLBreakpoint(bp_site_sp);
+
+  // Only check the breakpoint site for the current PC if the stop reason didn't
+  // have a valid breakpoint site.
+  if (StackFrameSP frame_sp = curr_thread->GetStackFrameAtIndex(0)) {
+    if (BreakpointSiteSP bp_site_sp =
+            process.GetBreakpointSiteList().FindByAddress(
+                frame_sp->GetStackID().GetPC()))
+      return BreakpointSiteMatchesREPLBreakpoint(bp_site_sp);
+  }
+
+  return false;
+}
+
 bool Process::HandleProcessStateChangedEvent(
     const EventSP &event_sp, Stream *stream,
     SelectMostRelevant select_most_relevant,
@@ -868,7 +931,6 @@ bool Process::HandleProcessStateChangedEvent(
       }
     } else {
       bool check_for_repl_breakpoint = false;
-      bool is_repl_breakpoint = false;
       ThreadSP curr_thread;
       StopInfoSP curr_thread_stop_info_sp;
       // Lock the thread list so it doesn't change on us, this is the scope for
@@ -933,8 +995,6 @@ bool Process::HandleProcessStateChangedEvent(
             case eStopReasonTrace:
             case eStopReasonBreakpoint:
             case eStopReasonWatchpoint:
-              check_for_repl_breakpoint = repl_is_enabled;
-              LLVM_FALLTHROUGH;
             case eStopReasonException:
             case eStopReasonExec:
             case eStopReasonFork:
@@ -947,7 +1007,6 @@ bool Process::HandleProcessStateChangedEvent(
                 other_thread = thread;
               break;
             case eStopReasonPlanComplete:
-              check_for_repl_breakpoint = repl_is_enabled;
               if (!plan_thread)
                 plan_thread = thread;
               break;
@@ -970,57 +1029,16 @@ bool Process::HandleProcessStateChangedEvent(
             if (thread)
               thread_list.SetSelectedThreadByID(thread->GetID());
           }
-        } else {
-          switch (curr_thread_stop_reason) {
-          case eStopReasonBreakpoint:
-          case eStopReasonWatchpoint:
-            check_for_repl_breakpoint = repl_is_enabled;
-            break;
-          case eStopReasonPlanComplete:
-            // We might have hit a breakpoint during our REPL evaluation and be
-            // stopped
-            // at the REPL breakpoint
-            check_for_repl_breakpoint = repl_is_enabled;
-            break;
-          default:
-            break;
-          }
         }
-      }
-
-      BreakpointSiteSP bp_site_sp;
-      if (check_for_repl_breakpoint) {
-        // Make sure this isn't the internal "REPL" breakpoint
-        if (curr_thread) {
-          StopInfoSP stop_info_sp = curr_thread->GetStopInfo();
-          if (stop_info_sp) {
-            bp_site_sp = process_sp->GetBreakpointSiteList().FindByID(
-                stop_info_sp->GetValue());
-            if (bp_site_sp) {
-              is_repl_breakpoint =
-                  BreakpointSiteMatchesREPLBreakpoint(bp_site_sp);
-            }
-          }
 
-          // Only check the breakpoint site for the current PC if the stop
-          // reason didn't have
-          // a valid breakpoint site
-          if (!bp_site_sp) {
-            // We might have stopped with a eStopReasonPlanComplete, see the PC
-            // is at
-
-            lldb::StackFrameSP frame_sp = curr_thread->GetStackFrameAtIndex(0);
-            if (frame_sp) {
-              bp_site_sp = process_sp->GetBreakpointSiteList().FindByAddress(
-                  frame_sp->GetStackID().GetPC());
-              if (bp_site_sp)
-                is_repl_breakpoint =
-                    BreakpointSiteMatchesREPLBreakpoint(bp_site_sp);
-            }
-          }
-        }
+        check_for_repl_breakpoint =
+            prefer_curr_thread ? IsDebuggerCausedStop(curr_thread_stop_reason)
+                               : AnyDebuggerCausedStop(thread_list);
       }
 
+      bool is_repl_breakpoint = repl_is_enabled && check_for_repl_breakpoint &&
+                                IsREPLBreakpoint(curr_thread.get());
+
       // Drop the ThreadList mutex by here, since GetThreadStatus below might
       // have to run code, e.g. for Data formatters, and if we hold the
       // ThreadList mutex, then the process is going to have a hard time