* infrun.c (keep_going): Wrap with resume_cleanups.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a73039be8213087590ccbfc47e956ff3df762b3a..c0809007d01c325f0555b16ca3d1419cd12eb02d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-28  Pedro Alves  <pedro@codesourcery.com>
+
+       * infrun.c (keep_going): Wrap with resume_cleanups.
+
 2009-10-27  Paul Pluzhnikov  <ppluzhnikov@google.com>
        
        * MAINTAINERS: Add self to "modify-after-approval" maintainers.

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 586746a75be97e1be3975c3f2d9fb03f04f89f19..842ff6b52e579f0263d8757032eb42f23a45466e 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -4812,6 +4812,10 @@ stop_stepping (struct execution_control_state *ecs)
 static void
 keep_going (struct execution_control_state *ecs)
 {
+  /* Make sure normal_stop is called if we get a QUIT handled before
+     reaching resume.  */
+  struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
+
   /* Save the pc before execution, to compare with pc after stop.  */
   ecs->event_thread->prev_pc
     = regcache_read_pc (get_thread_regcache (ecs->ptid));
@@ -4825,6 +4829,8 @@ keep_going (struct execution_control_state *ecs)
       /* We took a signal (which we are supposed to pass through to
         the inferior, else we'd not get here) and we haven't yet
         gotten our trap.  Simply continue.  */
+
+      discard_cleanups (old_cleanups);
       resume (currently_stepping (ecs->event_thread),
              ecs->event_thread->stop_signal);
     }
@@ -4887,6 +4893,7 @@ keep_going (struct execution_control_state *ecs)
          && !signal_program[ecs->event_thread->stop_signal])
        ecs->event_thread->stop_signal = TARGET_SIGNAL_0;
 
+      discard_cleanups (old_cleanups);
       resume (currently_stepping (ecs->event_thread),
              ecs->event_thread->stop_signal);
     }