summaryrefslogtreecommitdiff
path: root/gdb/infrun.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-05-30 17:37:50 +0000
committerTom Tromey <tromey@redhat.com>2013-05-30 17:37:50 +0000
commitc260d1c1076b7376edf5e78a35387e490a6a7c1b (patch)
treef338d6f9d200f80240749b5c00034a89fe9075dd /gdb/infrun.c
parentd8122e3514d9882af265f540f7685c0e8b0134e9 (diff)
downloadgdb-c260d1c1076b7376edf5e78a35387e490a6a7c1b.tar.gz
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.
Diffstat (limited to 'gdb/infrun.c')
-rw-r--r--gdb/infrun.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 376a440d46a..151fdd83aee 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);
}
}