Fix handling of auto_continue for stop hooks (#129622)

Follow-up fix discussed here:
llvm/llvm-project#129578 (comment)

---------

Co-authored-by: Jim Ingham <[email protected]>

Author: yln

lldb/source/Target/Target.cpp

@@ -3094,7 +3094,6 @@ bool Target::RunStopHooks() {
 
   bool print_hook_header = (m_stop_hooks.size() != 1);
   bool print_thread_header = (num_exe_ctx != 1);
-  bool auto_continue = false;
   bool should_stop = false;
   bool requested_continue = false;
 
@@ -3108,10 +3107,6 @@ bool Target::RunStopHooks() {
       if (!cur_hook_sp->ExecutionContextPasses(exc_ctx))
         continue;
 
-      // We only consult the auto-continue for a stop hook if it matched the
-      // specifier.
-      auto_continue |= cur_hook_sp->GetAutoContinue();
-
       if (print_hook_header && !any_thread_matched) {
         StreamString s;
         cur_hook_sp->GetDescription(s, eDescriptionLevelBrief);
@@ -3130,7 +3125,10 @@ bool Target::RunStopHooks() {
       auto result = cur_hook_sp->HandleStop(exc_ctx, output_sp);
       switch (result) {
       case StopHook::StopHookResult::KeepStopped:
-        should_stop = true;
+        if (cur_hook_sp->GetAutoContinue())
+          requested_continue = true;
+        else
+          should_stop = true;
         break;
       case StopHook::StopHookResult::RequestContinue:
         requested_continue = true;
@@ -3155,10 +3153,9 @@ bool Target::RunStopHooks() {
     }
   }
 
-  // Resume iff:
-  // 1) At least one hook requested to continue and no hook asked to stop, or
-  // 2) at least one hook had auto continue on.
-  if ((requested_continue && !should_stop) || auto_continue) {
+  // Resume iff at least one hook requested to continue and no hook asked to
+  // stop.
+  if (requested_continue && !should_stop) {
     Log *log = GetLog(LLDBLog::Process);
     Status error = m_process_sp->PrivateResume();
     if (error.Success()) {

lldb/test/API/commands/target/stop-hooks/TestStopHooks.py

@@ -9,9 +9,6 @@
 
 
 class TestStopHooks(TestBase):
-    # If your test case doesn't stress debug info, then
-    # set this to true.  That way it won't be run once for
-    # each debug info format.
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
@@ -42,12 +39,18 @@ def step_out_test(self):
 
         interp = self.dbg.GetCommandInterpreter()
         result = lldb.SBCommandReturnObject()
-        interp.HandleCommand("target stop-hook add -o 'expr g_var++'", result)
+        # Add two stop hooks here, one to auto-continue and one not.  Make sure
+        # that we still stop in that case.
+        interp.HandleCommand("target stop-hook add -G false -o 'expr g_var++'", result)
         self.assertTrue(result.Succeeded(), "Set the target stop hook")
+
+        interp.HandleCommand("target stop-hook add -G true -o 'expr g_var++'", result)
+        self.assertTrue(result.Succeeded(), "Set the second target stop hook")
+
         thread.StepOut()
         var = target.FindFirstGlobalVariable("g_var")
         self.assertTrue(var.IsValid())
-        self.assertEqual(var.GetValueAsUnsigned(), 1, "Updated g_var")
+        self.assertEqual(var.GetValueAsUnsigned(), 2, "Updated g_var")
 
     def after_expr_test(self):
         interp = self.dbg.GetCommandInterpreter()