From patchwork Sun Apr 7 19:57:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 32186 Received: (qmail 104034 invoked by alias); 7 Apr 2019 19:57:24 -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 103946 invoked by uid 89); 7 Apr 2019 19:57:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=caught, destroyed, rewriting X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.149.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 07 Apr 2019 19:57:21 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 301C1511A0 for ; Sun, 7 Apr 2019 14:57:20 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DDuqhZqEi2qH7DDuqhxRoJ; Sun, 07 Apr 2019 14:57:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mZ/NIR7jliwqVZNzWI7Yli6ZIzPrJRtqwG67tMbg0Cw=; b=chjY1n0Lez0TgWJpsfz718e3uM FXDBXLPkBHQ+eBbTAgtvQ1AS7+3aAvWLxhVgViYMeY0wWDJcm57iFkXn413Lu+GgkaQcAiWjoWwN3 rAhjUQVNN4RPAbH4c9bF7GTLv; Received: from 174-29-37-56.hlrn.qwest.net ([174.29.37.56]:51312 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1hDDuq-003h9z-0T; Sun, 07 Apr 2019 14:57:20 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 5/7] Remove some now-dead exception code Date: Sun, 7 Apr 2019 13:57:13 -0600 Message-Id: <20190407195715.24669-6-tom@tromey.com> In-Reply-To: <20190407195715.24669-1-tom@tromey.com> References: <20190407195715.24669-1-tom@tromey.com> After the rewriting to use try/catch, some of the exception code is now unused. This patch removes that code. gdb/ChangeLog 2019-04-07 Tom Tromey * common/common-exceptions.h (exception_rethrow): Don't declare. (TRY_SJLJ): Update comment. (TRY, CATCH, END_CATCH): Remove. * common/common-exceptions.c (exception_rethrow): Remove. --- gdb/ChangeLog | 7 +++++ gdb/common/common-exceptions.c | 10 ------- gdb/common/common-exceptions.h | 53 ++++------------------------------ 3 files changed, 13 insertions(+), 57 deletions(-) diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c index d00a805dd1f..d3c01e53387 100644 --- a/gdb/common/common-exceptions.c +++ b/gdb/common/common-exceptions.c @@ -165,16 +165,6 @@ exceptions_state_mc_action_iter_1 (void) return exceptions_state_mc (CATCH_ITER_1); } -/* Called by the default catch block. IOW, we'll get here before - jumping out to the next outermost scope an exception if a GDB - exception is not caught. */ - -void -exception_rethrow (void) -{ - throw; -} - /* Return EXCEPTION to the nearest containing CATCH_SJLJ block. */ void diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h index 55ce02dd61b..b09a34b0a35 100644 --- a/gdb/common/common-exceptions.h +++ b/gdb/common/common-exceptions.h @@ -164,10 +164,6 @@ extern int exceptions_state_mc_action_iter (void); extern int exceptions_state_mc_action_iter_1 (void); extern int exceptions_state_mc_catch (struct gdb_exception *, int); -/* For the C++ try/catch-based TRY/CATCH mechanism. */ - -extern void exception_rethrow (void) ATTRIBUTE_NORETURN; - /* Macro to wrap up standard try/catch behavior. The double loop lets us correctly handle code "break"ing out of the @@ -179,24 +175,21 @@ extern void exception_rethrow (void) ATTRIBUTE_NORETURN; *INDENT-OFF* - TRY + TRY_SJLJ { } - CATCH (e, RETURN_MASK_ERROR) + CATCH_SJLJ (e, RETURN_MASK_ERROR) { switch (e.reason) { case RETURN_ERROR: ... } } - END_CATCH + END_CATCH_SJLJ - Note that the SJLJ version of the macros are actually named - TRY_SJLJ/CATCH_SJLJ in order to make it possible to call them even - when TRY/CATCH are mapped to C++ try/catch. The SJLJ variants are - needed in some cases where gdb exceptions need to cross third-party - library code compiled without exceptions support (e.g., - readline). */ + The SJLJ variants are needed in some cases where gdb exceptions + need to cross third-party library code compiled without exceptions + support (e.g., readline). */ #define TRY_SJLJ \ { \ @@ -215,40 +208,6 @@ extern void exception_rethrow (void) ATTRIBUTE_NORETURN; #define END_CATCH_SJLJ \ } -/* We still need to wrap TRY/CATCH in C++ so that cleanups and C++ - exceptions can coexist. - - The TRY blocked is wrapped in a do/while(0) so that break/continue - within the block works the same as in C. - - END_CATCH makes sure that even if the CATCH block doesn't want to - catch the exception, we stop at every frame in the unwind chain to - run its cleanups, which may e.g., have pointers to stack variables - that are going to be destroyed. - - There's an outer scope around the whole TRY/END_CATCH in order to - cause a compilation error if you forget to add the END_CATCH at the - end a TRY/CATCH construct. */ - -#define TRY \ - { \ - try \ - { \ - do \ - { - -#define CATCH(EXCEPTION, MASK) \ - } while (0); \ - } \ - catch (struct gdb_exception ## _ ## MASK &EXCEPTION) - -#define END_CATCH \ - catch (...) \ - { \ - exception_rethrow (); \ - } \ - } - /* The exception types client code may catch. They're just shims around gdb_exception that add nothing but type info. Which is used is selected depending on the MASK argument passed to CATCH. */