From: Tom Tromey <tromey@redhat.com>
Date: Thu, 30 May 2013 17:37:50 +0000 (+0000)
Subject: some fixes to infrun.c
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=77f9e713027d32cc5ca1fb8d05e7b1b3f5397ec7;p=deliverable%2Fbinutils-gdb.git

some fixes to infrun.c

This fixes some of the problems in infrun.c that the checker reported.
I filed the remaining problems as bugs.

This patch is purely stylistic.

	* infrun.c (adjust_pc_after_break): Introduce an outer null
	cleanup.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 620af90467..7adba7755a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Tom Tromey  <tromey@redhat.com>
+
+	* infrun.c (adjust_pc_after_break): Introduce an outer null
+	cleanup.
+
 2013-05-30  Tom Tromey  <tromey@redhat.com>
 
 	* mi/mi-cmd-var.c (varobj_update_one): Add an outer null cleanup.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 376a440d46..151fdd83ae 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3027,10 +3027,10 @@ adjust_pc_after_break (struct execution_control_state *ecs)
   if (software_breakpoint_inserted_here_p (aspace, breakpoint_pc)
       || (non_stop && moribund_breakpoint_here_p (aspace, breakpoint_pc)))
     {
-      struct cleanup *old_cleanups = NULL;
+      struct cleanup *old_cleanups = make_cleanup (null_cleanup, NULL);
 
       if (RECORD_IS_USED)
-	old_cleanups = record_full_gdb_operation_disable_set ();
+	record_full_gdb_operation_disable_set ();
 
       /* When using hardware single-step, a SIGTRAP is reported for both
 	 a completed single-step and a software breakpoint.  Need to
@@ -3056,8 +3056,7 @@ adjust_pc_after_break (struct execution_control_state *ecs)
 	  || ecs->event_thread->prev_pc == breakpoint_pc)
 	regcache_write_pc (regcache, breakpoint_pc);
 
-      if (RECORD_IS_USED)
-	do_cleanups (old_cleanups);
+      do_cleanups (old_cleanups);
     }
 }