From 156d9eab863f40fc812245cf1213abbe12d192b3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 7 Apr 2017 15:37:25 -0600 Subject: [PATCH] Use scoped_restore in more places This changes a few more places to use scoped_restore, allowing some cleanup removals. gdb/ChangeLog 2017-04-12 Tom Tromey * mi/mi-main.c (exec_direction_forward): Remove. (exec_reverse_continue, mi_execute_command): Use scoped_restore. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Use scoped_restore. * guile/guile.c (guile_repl_command, guile_command) (gdbscm_execute_gdb_command): Use scoped_restore. * go-exp.y (go_parse): Use scoped_restore. * d-exp.y (d_parse): Use scoped_restore. * cli/cli-decode.c (cmd_func): Use scoped_restore. * c-exp.y (c_parse): Use scoped_restore. --- gdb/ChangeLog | 13 +++++++++++++ gdb/c-exp.y | 4 ++-- gdb/cli/cli-decode.c | 10 +++------- gdb/d-exp.y | 4 ++-- gdb/go-exp.y | 4 ++-- gdb/guile/guile.c | 24 ++++++------------------ gdb/guile/scm-ports.c | 3 +-- gdb/mi/mi-main.c | 25 +++++++------------------ 8 files changed, 36 insertions(+), 51 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index feee3e738f..36514272a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2017-04-12 Tom Tromey + + * mi/mi-main.c (exec_direction_forward): Remove. + (exec_reverse_continue, mi_execute_command): Use scoped_restore. + * guile/scm-ports.c (ioscm_with_output_to_port_worker): Use + scoped_restore. + * guile/guile.c (guile_repl_command, guile_command) + (gdbscm_execute_gdb_command): Use scoped_restore. + * go-exp.y (go_parse): Use scoped_restore. + * d-exp.y (d_parse): Use scoped_restore. + * cli/cli-decode.c (cmd_func): Use scoped_restore. + * c-exp.y (c_parse): Use scoped_restore. + 2017-04-12 Tom Tromey * mi/mi-parse.h (struct mi_parse): Add constructor, destructor. diff --git a/gdb/c-exp.y b/gdb/c-exp.y index b2fc1959c0..283b7375c0 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -3188,8 +3188,8 @@ c_parse (struct parser_state *par_state) gdb_assert (! macro_original_text); make_cleanup (scan_macro_cleanup, 0); - make_cleanup_restore_integer (&yydebug); - yydebug = parser_debug; + scoped_restore restore_yydebug = make_scoped_restore (&yydebug, + parser_debug); /* Initialize some state used by the lexer. */ last_was_structop = 0; diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index fc14465211..d45733eff3 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -23,6 +23,7 @@ #include "ui-out.h" #include "cli/cli-cmds.h" #include "cli/cli-decode.h" +#include "common/gdb_optional.h" /* Prototypes for local functions. */ @@ -1878,17 +1879,12 @@ cmd_func (struct cmd_list_element *cmd, char *args, int from_tty) { if (cmd_func_p (cmd)) { - struct cleanup *cleanups = make_cleanup (null_cleanup, NULL); + gdb::optional> restore_suppress; if (cmd->suppress_notification != NULL) - { - make_cleanup_restore_integer (cmd->suppress_notification); - *cmd->suppress_notification = 1; - } + restore_suppress.emplace (cmd->suppress_notification, 1); (*cmd->func) (cmd, args, from_tty); - - do_cleanups (cleanups); } else error (_("Invalid command")); diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 06eef5f229..62df73727f 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -1629,9 +1629,9 @@ d_parse (struct parser_state *par_state) back_to = make_cleanup (null_cleanup, NULL); - make_cleanup_restore_integer (&yydebug); + scoped_restore restore_yydebug = make_scoped_restore (&yydebug, + parser_debug); make_cleanup_clear_parser_state (&pstate); - yydebug = parser_debug; /* Initialize some state used by the lexer. */ last_was_structop = 0; diff --git a/gdb/go-exp.y b/gdb/go-exp.y index 1906e68c7a..057e2277e8 100644 --- a/gdb/go-exp.y +++ b/gdb/go-exp.y @@ -1569,9 +1569,9 @@ go_parse (struct parser_state *par_state) back_to = make_cleanup (null_cleanup, NULL); - make_cleanup_restore_integer (&yydebug); + scoped_restore restore_yydebug = make_scoped_restore (&yydebug, + parser_debug); make_cleanup_clear_parser_state (&pstate); - yydebug = parser_debug; /* Initialize some state used by the lexer. */ last_was_structop = 0; diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c index 9bb2487c54..0dadc3ccc8 100644 --- a/gdb/guile/guile.c +++ b/gdb/guile/guile.c @@ -163,10 +163,7 @@ const struct extension_language_ops guile_extension_ops = static void guile_repl_command (char *arg, int from_tty) { - struct cleanup *cleanup; - - cleanup = make_cleanup_restore_integer (¤t_ui->async); - current_ui->async = 0; + scoped_restore restore_async = make_scoped_restore (¤t_ui->async, 0); arg = skip_spaces (arg); @@ -183,8 +180,6 @@ guile_repl_command (char *arg, int from_tty) dont_repeat (); gdbscm_enter_repl (); } - - do_cleanups (cleanup); } /* Implementation of the gdb "guile" command. @@ -196,10 +191,7 @@ guile_repl_command (char *arg, int from_tty) static void guile_command (char *arg, int from_tty) { - struct cleanup *cleanup; - - cleanup = make_cleanup_restore_integer (¤t_ui->async); - current_ui->async = 0; + scoped_restore restore_async = make_scoped_restore (¤t_ui->async, 0); arg = skip_spaces (arg); @@ -209,6 +201,8 @@ guile_command (char *arg, int from_tty) if (msg != NULL) { + /* It is ok that this is a "dangling cleanup" because we + throw immediately. */ make_cleanup (xfree, msg); error ("%s", msg); } @@ -219,8 +213,6 @@ guile_command (char *arg, int from_tty) execute_control_command_untraced (l.get ()); } - - do_cleanups (cleanup); } /* Given a command_line, return a command string suitable for passing @@ -326,10 +318,8 @@ gdbscm_execute_gdb_command (SCM command_scm, SCM rest) TRY { - struct cleanup *inner_cleanups; - - inner_cleanups = make_cleanup_restore_integer (¤t_ui->async); - current_ui->async = 0; + scoped_restore restore_async = make_scoped_restore (¤t_ui->async, + 0); scoped_restore preventer = prevent_dont_repeat (); if (to_string) @@ -339,8 +329,6 @@ gdbscm_execute_gdb_command (SCM command_scm, SCM rest) /* Do any commands attached to breakpoint we stopped at. */ bpstat_do_actions (); - - do_cleanups (inner_cleanups); } CATCH (ex, RETURN_MASK_ALL) { diff --git a/gdb/guile/scm-ports.c b/gdb/guile/scm-ports.c index fb3a47ba08..735abc28ae 100644 --- a/gdb/guile/scm-ports.c +++ b/gdb/guile/scm-ports.c @@ -470,8 +470,7 @@ ioscm_with_output_to_port_worker (SCM port, SCM thunk, enum oport oport, cleanups = set_batch_flag_and_make_cleanup_restore_page_info (); - make_cleanup_restore_integer (¤t_ui->async); - current_ui->async = 0; + scoped_restore restore_async = make_scoped_restore (¤t_ui->async, 0); ui_file_up port_file (new ioscm_file_port (port)); diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index d99c40e928..c3e7bf77a5 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -54,6 +54,7 @@ #include "extension.h" #include "gdbcmd.h" #include "observer.h" +#include "common/gdb_optional.h" #include #include "run-time-clock.h" @@ -311,17 +312,10 @@ exec_continue (char **argv, int argc) } } -static void -exec_direction_forward (void *notused) -{ - execution_direction = EXEC_FORWARD; -} - static void exec_reverse_continue (char **argv, int argc) { enum exec_direction_kind dir = execution_direction; - struct cleanup *old_chain; if (dir == EXEC_REVERSE) error (_("Already in reverse mode.")); @@ -329,10 +323,9 @@ exec_reverse_continue (char **argv, int argc) if (!target_can_execute_reverse) error (_("Target %s does not support this command."), target_shortname); - old_chain = make_cleanup (exec_direction_forward, NULL); - execution_direction = EXEC_REVERSE; + scoped_restore save_exec_dir = make_scoped_restore (&execution_direction, + EXEC_REVERSE); exec_continue (argv, argc); - do_cleanups (old_chain); } void @@ -2140,15 +2133,13 @@ mi_execute_command (const char *cmd, int from_tty) if (command != NULL) { ptid_t previous_ptid = inferior_ptid; - struct cleanup *cleanup = make_cleanup (null_cleanup, NULL); - command->token = token; + gdb::optional> restore_suppress; if (command->cmd != NULL && command->cmd->suppress_notification != NULL) - { - make_cleanup_restore_integer (command->cmd->suppress_notification); - *command->cmd->suppress_notification = 1; - } + restore_suppress.emplace (command->cmd->suppress_notification, 1); + + command->token = token; if (do_timings) { @@ -2210,8 +2201,6 @@ mi_execute_command (const char *cmd, int from_tty) (USER_SELECTED_THREAD | USER_SELECTED_FRAME); } } - - do_cleanups (cleanup); } } -- 2.34.1