From 89f8fb50fa16b0ef510dcd6de9088cee9820116d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 23 Jan 2019 18:58:31 +0000 Subject: [PATCH] Remove remaining cleanup from gdb/breakpoint.c In v3: remove the "have BKPT_CHAIN already discarded" comment too. The remaining null cleanup in breakpoint.c does not seem to protect anything, so remove it. gdb/ChangeLog: 2019-01-23 Tom Tromey Pedro Alves * breakpoint.c (create_breakpoint): Remove cleanup. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 55acd810427..a400cbce5d0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-01-23 Tom Tromey + Pedro Alves + + * breakpoint.c (create_breakpoint): Remove cleanup. + 2019-01-23 Tom Tromey Andrew Burgess Pedro Alves diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 999809c3123..33c5bfef43d 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9230,7 +9230,6 @@ create_breakpoint (struct gdbarch *gdbarch, unsigned flags) { struct linespec_result canonical; - struct cleanup *bkpt_chain = NULL; int pending = 0; int task = 0; int prev_bkpt_count = breakpoint_count; @@ -9280,12 +9279,6 @@ create_breakpoint (struct gdbarch *gdbarch, if (!pending && canonical.lsals.empty ()) return 0; - /* ----------------------------- SNIP ----------------------------- - Anything added to the cleanup chain beyond this point is assumed - to be part of a breakpoint. If the breakpoint create succeeds - then the memory is not reclaimed. */ - bkpt_chain = make_cleanup (null_cleanup, 0); - /* Resolve all line numbers to PC's and verify that the addresses are ok for the target. */ if (!pending) @@ -9384,11 +9377,6 @@ create_breakpoint (struct gdbarch *gdbarch, prev_breakpoint_count = prev_bkpt_count; } - /* That's it. Discard the cleanups for data inserted into the - breakpoint. */ - discard_cleanups (bkpt_chain); - - /* error call may happen here - have BKPT_CHAIN already discarded. */ update_global_location_list (UGLL_MAY_INSERT); return 1; -- 2.30.2