From patchwork Sun Oct 8 22:52:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 23397 Received: (qmail 104172 invoked by alias); 8 Oct 2017 22:52:52 -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 103438 invoked by uid 89); 8 Oct 2017 22:52:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=seemed, they're, Notes X-HELO: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 08 Oct 2017 22:52:50 +0000 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy10.mail.unifiedlayer.com (Postfix) with ESMTP id 1487514050E for ; Sun, 8 Oct 2017 16:52:49 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id KAsl1w00U2f2jeq01AsoYY; Sun, 08 Oct 2017 16:52:49 -0600 X-Authority-Analysis: v=2.2 cv=K/VSJ2eI c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=02M-m0pO-4AA:10 a=zstS-IiYAAAA:8 a=B-IR59zdZp56MkqRzVcA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-4-236.hlrn.qwest.net ([75.166.4.236]:42154 helo=bapiya.localdomain) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1e1KRB-0026a3-Oc; Sun, 08 Oct 2017 16:52:45 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA] Remove cleanup from frame_prepare_for_sniffer Date: Sun, 8 Oct 2017 16:52:43 -0600 Message-Id: <20171008225243.21921-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1e1KRB-0026a3-Oc X-Source-Sender: 75-166-4-236.hlrn.qwest.net (bapiya.localdomain) [75.166.4.236]:42154 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes Currently frame_prepare_for_sniffer returns a cleanup. This patch changes it to return void, and exposes frame_cleanup_after_sniffer to the caller. Normally I would write an RAII class for this sort of thing; but because there was just a single caller of frame_prepare_for_sniffer, and because this caller is already using try/catch, I thought it seemed ok to require explicit calls in this instance. Regression tested by the buildbot. gdb/ChangeLog 2017-10-08 Tom Tromey * frame-unwind.c (frame_unwind_try_unwinder): Update. * frame.h (frame_cleanup_after_sniffer): Declare. (frame_prepare_for_sniffer): Return void. * frame.c (frame_cleanup_after_sniffer): No longer static. Change type of argument. (frame_prepare_for_sniffer): Return void. --- gdb/ChangeLog | 9 +++++++++ gdb/frame-unwind.c | 12 ++++-------- gdb/frame.c | 13 +++++-------- gdb/frame.h | 13 +++++++++---- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index 096631c58b..ede226abb0 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -97,10 +97,9 @@ static int frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache, const struct frame_unwind *unwinder) { - struct cleanup *old_cleanup; int res = 0; - old_cleanup = frame_prepare_for_sniffer (this_frame, unwinder); + frame_prepare_for_sniffer (this_frame, unwinder); TRY { @@ -117,7 +116,7 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache, thus most unwinders aren't able to determine if they're the best fit. Keep trying. Fallback prologue unwinders should always accept the frame. */ - do_cleanups (old_cleanup); + frame_cleanup_after_sniffer (this_frame); return 0; } throw_exception (ex); @@ -125,15 +124,12 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache, END_CATCH if (res) - { - discard_cleanups (old_cleanup); - return 1; - } + return 1; else { /* Don't set *THIS_CACHE to NULL here, because sniffer has to do so. */ - do_cleanups (old_cleanup); + frame_cleanup_after_sniffer (this_frame); return 0; } gdb_assert_not_reached ("frame_unwind_try_unwinder"); diff --git a/gdb/frame.c b/gdb/frame.c index afdc157ebd..17f7397aee 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -2864,11 +2864,9 @@ frame_stop_reason_symbol_string (enum unwind_stop_reason reason) /* Clean up after a failed (wrong unwinder) attempt to unwind past FRAME. */ -static void -frame_cleanup_after_sniffer (void *arg) +void +frame_cleanup_after_sniffer (struct frame_info *frame) { - struct frame_info *frame = (struct frame_info *) arg; - /* The sniffer should not allocate a prologue cache if it did not match this frame. */ gdb_assert (frame->prologue_cache == NULL); @@ -2893,16 +2891,15 @@ frame_cleanup_after_sniffer (void *arg) } /* Set FRAME's unwinder temporarily, so that we can call a sniffer. - Return a cleanup which should be called if unwinding fails, and - discarded if it succeeds. */ + If sniffing fails, the caller should be sure to call + frame_cleanup_after_sniffer. */ -struct cleanup * +void frame_prepare_for_sniffer (struct frame_info *frame, const struct frame_unwind *unwind) { gdb_assert (frame->unwind == NULL); frame->unwind = unwind; - return make_cleanup (frame_cleanup_after_sniffer, frame); } static struct cmd_list_element *set_backtrace_cmdlist; diff --git a/gdb/frame.h b/gdb/frame.h index 1b726108b9..190ce7623f 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -791,11 +791,16 @@ extern void info_locals_command (char *, int); extern void return_command (char *, int); /* Set FRAME's unwinder temporarily, so that we can call a sniffer. - Return a cleanup which should be called if unwinding fails, and - discarded if it succeeds. */ + If sniffing fails, the caller should be sure to call + frame_cleanup_after_sniffer. */ -struct cleanup *frame_prepare_for_sniffer (struct frame_info *frame, - const struct frame_unwind *unwind); +extern void frame_prepare_for_sniffer (struct frame_info *frame, + const struct frame_unwind *unwind); + +/* Clean up after a failed (wrong unwinder) attempt to unwind past + FRAME. */ + +extern void frame_cleanup_after_sniffer (struct frame_info *frame); /* Notes (cagney/2002-11-27, drow/2003-09-06):