From patchwork Sat Jan 12 11:50:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 31041 Received: (qmail 124720 invoked by alias); 12 Jan 2019 11:50:53 -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 124613 invoked by uid 89); 12 Jan 2019 11:50:53 -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, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:check_f, sk:fetch_i, execute_command, caught X-HELO: mail-wr1-f46.google.com Received: from mail-wr1-f46.google.com (HELO mail-wr1-f46.google.com) (209.85.221.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 12 Jan 2019 11:50:49 +0000 Received: by mail-wr1-f46.google.com with SMTP id v13so17905557wrw.5 for ; Sat, 12 Jan 2019 03:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=H/NNVs0DQoirPWdODxjHAgg5OgMKUtz+Pi3auq34ixA=; b=PIvm8olFfQdSa4fn/mtxZkFTlDiidf9eZ5K8sXasEUuL5ej7p+tuNVgMwutkYKk+CU AAYDgg0n7/XmvF0aRlmIr3xAhuIsVnYNS5od576B/m1PztmucTCvr9a/6l6QGo2HLXhg sLN9r3OPNT4BhzB3RlFc84Z1oVaGgJZ8POluOWLmJMQnZlZdJGrh/oIQlMIcEzGLaPYK EHyyBz3PiRP9vgljX6OOoHCSZJeSSiBF68QuDsLWh+DvmbrzSnd3Nme15EiIfy9bi6B1 II1YzGG+l8lC0ee/ESiE23dEoALvr1P+vIo4vaqr9QSUWRbZoEfkgkLY2WINEfOnIXVZ I1sw== Return-Path: Received: from localhost (host86-172-198-47.range86-172.btcentralplus.com. [86.172.198.47]) by smtp.gmail.com with ESMTPSA id a17sm22930925wma.15.2019.01.12.03.50.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Jan 2019 03:50:46 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Tom Tromey , Andrew Burgess Subject: [PATCH 3/4] gdb: Remove make_bpstat_clear_actions_cleanup Date: Sat, 12 Jan 2019 11:50:36 +0000 Message-Id: In-Reply-To: References: In-Reply-To: References: <20190109033426.16062-1-tom@tromey.com> X-IsSubscribed: yes This removes make_bpstat_clear_actions_cleanup, replacing it with uses of cleanup_function. gdb/ChangeLog: * breakpoint.c (bpstat_do_actions): Use bpstat_clear_actions_cleanup. * infrun.c (fetch_inferior_event): Likewise. * top.c (execute_command): Likewise. * breakpoint.h (bpstat_clear_actions_cleanup): Define. * utils.h (make_bpstat_clear_actions_cleanup): Don't declare. * utils.c (do_bpstat_clear_actions_cleanup): Delete (make_bpstat_clear_actions_cleanup): Delete. --- gdb/ChangeLog | 12 ++++++++++++ gdb/breakpoint.c | 4 ++-- gdb/breakpoint.h | 9 +++++++++ gdb/infrun.c | 7 ++++--- gdb/top.c | 7 +++---- gdb/utils.c | 17 ----------------- gdb/utils.h | 1 - 7 files changed, 30 insertions(+), 27 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1461695df1b..4ea26806449 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 (); + bpstat_clear_actions_cleanup cleanup_if_error; 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.cancel (); } /* Print out the (old or new) value associated with a watchpoint. */ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 5cbfb1ecfc6..a1d633e900f 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1093,6 +1093,15 @@ extern void bpstat_do_actions (void); not be performed. */ extern void bpstat_clear_actions (void); +/* Cleanup class that calls bpstat_clear_actions. */ +#ifdef __cpp_template_auto +using bpstat_clear_actions_cleanup + = cleanup_function ; +#else +using bpstat_clear_actions_cleanup + = cleanup_function ; +#endif + /* Implementation: */ /* Values used to tell the printing routine how to behave for this diff --git a/gdb/infrun.c b/gdb/infrun.c index 150288264f4..b697145a147 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3758,9 +3758,9 @@ 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 (); - - make_cleanup (delete_just_stopped_threads_infrun_breakpoints_cleanup, NULL); + bpstat_clear_actions_cleanup defer_bpstat_clear; + struct cleanup *ts_old_chain + = make_cleanup (delete_just_stopped_threads_infrun_breakpoints_cleanup, NULL); /* Now figure out what to do with the result of the result. */ handle_inferior_event (ecs); @@ -3814,6 +3814,7 @@ fetch_inferior_event (void *client_data) } discard_cleanups (ts_old_chain); + defer_bpstat_clear.cancel (); /* No error, don't finish the thread states yet. */ finish_state.release (); diff --git a/gdb/top.c b/gdb/top.c index 900e78aaec5..1c2f60d4c60 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -539,12 +539,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 (); + bpstat_clear_actions_cleanup cleanup_if_error; scoped_value_mark cleanup = prepare_execute_command (); /* Force cleanup of any alloca areas if using C alloca instead of @@ -554,7 +553,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.cancel (); return; } @@ -649,7 +648,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.cancel (); } /* Run execute_command for P and FROM_TTY. Capture its output into the diff --git a/gdb/utils.c b/gdb/utils.c index ed8d60fa7b0..4af75e34809 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 f2fe1da832c..896feb973c9 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. */