From patchwork Wed Jan 23 15:21:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 31195 Received: (qmail 94815 invoked by alias); 23 Jan 2019 15:28:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 94804 invoked by uid 89); 23 Jan 2019 15:28:06 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Jan 2019 15:28:05 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8EDA38B139; Wed, 23 Jan 2019 15:21:43 +0000 (UTC) Received: from localhost.localdomain (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFA0D67141; Wed, 23 Jan 2019 15:21:42 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Tom Tromey , Andrew Burgess Subject: [PATCH v3 09/17] Remove make_bpstat_clear_actions_cleanup Date: Wed, 23 Jan 2019 15:21:23 +0000 Message-Id: <20190123152131.29893-10-palves@redhat.com> In-Reply-To: <20190123152131.29893-1-palves@redhat.com> References: <20190123152131.29893-1-palves@redhat.com> From: Tom Tromey This removes make_bpstat_clear_actions_cleanup, replacing it with uses of scope_exit. gdb/ChangeLog: yyyy-mm-dd 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/breakpoint.c | 4 ++-- gdb/infrun.c | 6 +++--- gdb/top.c | 8 ++++---- gdb/utils.c | 17 ----------------- gdb/utils.h | 1 - 5 files changed, 9 insertions(+), 27 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 33c5bfef43..f9dd194487 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 065fbf06d8..76dedd272a 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 900e78aaec..cf6a6abc7d 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 ed8d60fa7b..4af75e3480 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 f2fe1da832..896feb973c 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. */