From 694c6bf5425024a8654a5541dec88e4dd6ddafb5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 23 Jan 2019 18:58:33 +0000 Subject: [PATCH] Remove make_bpstat_clear_actions_cleanup This removes make_bpstat_clear_actions_cleanup, replacing it with uses of scope_exit. gdb/ChangeLog: 2019-01-23 Tom Tromey Andrew Burgess Pedro Alves * infrun.c (fetch_inferior_event): Use scope_exit. * utils.h (make_bpstat_clear_actions_cleanup): Don't declare. * top.c (execute_command): Use scope_exit. * breakpoint.c (bpstat_do_actions): Use scope_exit. * utils.c (do_bpstat_clear_actions_cleanup) (make_bpstat_clear_actions_cleanup): Remove. --- gdb/ChangeLog | 11 +++++++++++ gdb/breakpoint.c | 4 ++-- gdb/infrun.c | 6 +++--- gdb/top.c | 8 ++++---- gdb/utils.c | 17 ----------------- gdb/utils.h | 1 - 6 files changed, 20 insertions(+), 27 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6f1bcba..b10e051 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,15 @@ 2019-01-23 Tom Tromey + Andrew Burgess + Pedro Alves + + * infrun.c (fetch_inferior_event): Use scope_exit. + * utils.h (make_bpstat_clear_actions_cleanup): Don't declare. + * top.c (execute_command): Use scope_exit. + * breakpoint.c (bpstat_do_actions): Use scope_exit. + * utils.c (do_bpstat_clear_actions_cleanup) + (make_bpstat_clear_actions_cleanup): Remove. + +2019-01-23 Tom Tromey Pedro Alves * infrun.c: Include "common/scope-exit.h" diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 33c5bfe..f9dd194 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4468,7 +4468,7 @@ get_bpstat_thread () void bpstat_do_actions (void) { - struct cleanup *cleanup_if_error = make_bpstat_clear_actions_cleanup (); + auto cleanup_if_error = make_scope_exit (bpstat_clear_actions); thread_info *tp; /* Do any commands attached to breakpoint we are stopped at. */ @@ -4482,7 +4482,7 @@ bpstat_do_actions (void) break; } - discard_cleanups (cleanup_if_error); + cleanup_if_error.release (); } /* Print out the (old or new) value associated with a watchpoint. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 065fbf0..76dedd2 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3745,8 +3745,8 @@ fetch_inferior_event (void *client_data) /* Get executed before make_cleanup_restore_current_thread above to apply still for the thread which has thrown the exception. */ - struct cleanup *ts_old_chain = make_bpstat_clear_actions_cleanup (); - + auto defer_bpstat_clear + = make_scope_exit (bpstat_clear_actions); auto defer_delete_threads = make_scope_exit (delete_just_stopped_threads_infrun_breakpoints); @@ -3802,7 +3802,7 @@ fetch_inferior_event (void *client_data) } defer_delete_threads.release (); - discard_cleanups (ts_old_chain); + defer_bpstat_clear.release (); /* No error, don't finish the thread states yet. */ finish_state.release (); diff --git a/gdb/top.c b/gdb/top.c index 900e78a..cf6a6ab 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -52,6 +52,7 @@ #include "frame.h" #include "buffer.h" #include "gdb_select.h" +#include "common/scope-exit.h" /* readline include files. */ #include "readline/readline.h" @@ -539,12 +540,11 @@ set_repeat_arguments (const char *args) void execute_command (const char *p, int from_tty) { - struct cleanup *cleanup_if_error; struct cmd_list_element *c; const char *line; const char *cmd_start = p; - cleanup_if_error = make_bpstat_clear_actions_cleanup (); + auto cleanup_if_error = make_scope_exit (bpstat_clear_actions); scoped_value_mark cleanup = prepare_execute_command (); /* Force cleanup of any alloca areas if using C alloca instead of @@ -554,7 +554,7 @@ execute_command (const char *p, int from_tty) /* This can happen when command_line_input hits end of file. */ if (p == NULL) { - discard_cleanups (cleanup_if_error); + cleanup_if_error.release (); return; } @@ -649,7 +649,7 @@ execute_command (const char *p, int from_tty) if (has_stack_frames () && inferior_thread ()->state != THREAD_RUNNING) check_frame_language_change (); - discard_cleanups (cleanup_if_error); + cleanup_if_error.release (); } /* Run execute_command for P and FROM_TTY. Capture its output into the diff --git a/gdb/utils.c b/gdb/utils.c index ed8d60f..4af75e3 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3057,23 +3057,6 @@ parse_pid_to_attach (const char *args) return pid; } -/* Helper for make_bpstat_clear_actions_cleanup. */ - -static void -do_bpstat_clear_actions_cleanup (void *unused) -{ - bpstat_clear_actions (); -} - -/* Call bpstat_clear_actions for the case an exception is throw. You should - discard_cleanups if no exception is caught. */ - -struct cleanup * -make_bpstat_clear_actions_cleanup (void) -{ - return make_cleanup (do_bpstat_clear_actions_cleanup, NULL); -} - /* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP must come from xrealloc-compatible allocator and it may be updated. FROM needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be diff --git a/gdb/utils.h b/gdb/utils.h index f2fe1da..896feb9 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -286,7 +286,6 @@ private: int m_save_batch_flag; }; -extern struct cleanup *make_bpstat_clear_actions_cleanup (void); /* Path utilities. */ -- 2.7.4