diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 11 | ||||
| -rw-r--r-- | gdb/infcmd.c | 12 | ||||
| -rw-r--r-- | gdb/inferior.h | 4 |
4 files changed, 15 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6395791..55acd81 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-01-23 Tom Tromey <tom@tromey.com> + Andrew Burgess <andrew.burgess@embecosm.com> + Pedro Alves <palves@redhat.com> + 2019-01-23 Pedro Alves <palves@redhat.com> * gdbarch-selftests.c (struct on_exit): Use SCOPE_EXIT. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 3166fa0..999809c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -11073,7 +11073,6 @@ until_break_command (const char *arg, int from_tty, int anywhere) struct gdbarch *frame_gdbarch; struct frame_id stack_frame_id; struct frame_id caller_frame_id; - struct cleanup *old_chain; int thread; struct thread_info *tp; struct until_break_fsm *sm; @@ -11106,8 +11105,6 @@ until_break_command (const char *arg, int from_tty, int anywhere) tp = inferior_thread (); thread = tp->global_num; - old_chain = make_cleanup (null_cleanup, NULL); - /* Note linespec handling above invalidates the frame chain. Installing a breakpoint also invalidates the frame chain (as it may need to switch threads), so do any frame handling before @@ -11122,6 +11119,9 @@ until_break_command (const char *arg, int from_tty, int anywhere) one. */ breakpoint_up caller_breakpoint; + + gdb::optional<delete_longjmp_breakpoint_cleanup> lj_deleter; + if (frame_id_p (caller_frame_id)) { struct symtab_and_line sal2; @@ -11136,7 +11136,7 @@ until_break_command (const char *arg, int from_tty, int anywhere) bp_until); set_longjmp_breakpoint (tp, caller_frame_id); - make_cleanup (delete_longjmp_breakpoint_cleanup, &thread); + lj_deleter.emplace (thread); } /* set_momentary_breakpoint could invalidate FRAME. */ @@ -11159,7 +11159,8 @@ until_break_command (const char *arg, int from_tty, int anywhere) std::move (caller_breakpoint)); tp->thread_fsm = &sm->thread_fsm; - discard_cleanups (old_chain); + if (lj_deleter) + lj_deleter->release (); proceed (-1, GDB_SIGNAL_DEFAULT); } diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 3c3add8..fafb7e2 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -947,13 +947,6 @@ nexti_command (const char *count_string, int from_tty) step_1 (1, 1, count_string); } -void -delete_longjmp_breakpoint_cleanup (void *arg) -{ - int thread = * (int *) arg; - delete_longjmp_breakpoint (thread); -} - /* Data for the FSM that manages the step/next/stepi/nexti commands. */ @@ -1517,7 +1510,6 @@ until_next_command (int from_tty) struct symtab_and_line sal; struct thread_info *tp = inferior_thread (); int thread = tp->global_num; - struct cleanup *old_chain; struct until_next_fsm *sm; clear_proceed_status (0); @@ -1556,11 +1548,11 @@ until_next_command (int from_tty) tp->control.step_over_calls = STEP_OVER_ALL; set_longjmp_breakpoint (tp, get_frame_id (frame)); - old_chain = make_cleanup (delete_longjmp_breakpoint_cleanup, &thread); + delete_longjmp_breakpoint_cleanup lj_deleter (thread); sm = new_until_next_fsm (command_interp (), tp->global_num); tp->thread_fsm = &sm->thread_fsm; - discard_cleanups (old_chain); + lj_deleter.release (); proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT); } diff --git a/gdb/inferior.h b/gdb/inferior.h index a82df1a..cadaaed 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -51,6 +51,7 @@ struct thread_info; #include "symfile-add-flags.h" #include "common/refcounted-object.h" +#include "common/forward-scope-exit.h" #include "common-inferior.h" #include "gdbthread.h" @@ -198,7 +199,8 @@ extern void continue_1 (int all_threads); extern void interrupt_target_1 (int all_threads); -extern void delete_longjmp_breakpoint_cleanup (void *arg); +using delete_longjmp_breakpoint_cleanup + = FORWARD_SCOPE_EXIT (delete_longjmp_breakpoint); extern void detach_command (const char *, int); |