[Bug gdb/31194] Stepping on "int3" instruction fails assertion.

["tromey at sourceware dot org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=31194

--- Comment #10 from Tom Tromey <tromey at sourceware dot org> ---
This works but I have no idea if it is correct.

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 1d863896c40..c9c16001f82 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -7115,6 +7115,7 @@ handle_signal_stop (struct execution_control_state *ecs)

   /* Maybe this was a trap for a software breakpoint that has since
      been removed.  */
+  bool program_bp = false;
   if (random_signal && target_stopped_by_sw_breakpoint ())
     {
       if (gdbarch_program_breakpoint_here_p (gdbarch,
@@ -7123,6 +7124,7 @@ handle_signal_stop (struct execution_control_state *ecs)
          struct regcache *regcache;
          int decr_pc;

+         program_bp = true;
          /* Re-adjust PC to what the program would see if GDB was not
             debugging it.  */
          regcache = get_thread_regcache (ecs->event_thread);
@@ -7161,7 +7163,8 @@ handle_signal_stop (struct execution_control_state *ecs)
   /* If not, perhaps stepping/nexting can.  */
   if (random_signal)
     random_signal = !(ecs->event_thread->stop_signal () == GDB_SIGNAL_TRAP
-                     && currently_stepping (ecs->event_thread));
+                     && currently_stepping (ecs->event_thread)
+                     && !program_bp);

   /* Perhaps the thread hit a single-step breakpoint of _another_
      thread.  Single-step breakpoints are transparent to the

-- 
You are receiving this mail because:
You are on the CC list for the bug.