From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19457 invoked by alias); 13 Feb 2019 21:29:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 18601 invoked by uid 89); 13 Feb 2019 21:29:43 -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_HELO_PASS autolearn=ham version=3.3.2 spammy=Called, destroyed X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 13 Feb 2019 21:29:37 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway24.websitewelcome.com (Postfix) with ESMTP id D1E92422AB for ; Wed, 13 Feb 2019 15:29:35 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id u263gk3Eu90onu263g7FLg; Wed, 13 Feb 2019 15:29:35 -0600 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=fCFKCKp73eTelB6ln8w0/KFsuY1PCp61JMDFZ3DNbLI=; b=eyQ/qIPVggkGE6HAUZUrD7fEou JjO91/IaAcX+JMIEasuEXrQSeqBI7/1l5RD9OUT5nlDoe2vOf1G8oA9CjRSAEIkqqZDSe+tgOg9vB KDvWPdbVyAcak54ax2b3zOySC; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:42554 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gu263-001UWe-Km; Wed, 13 Feb 2019 15:29:35 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 16/20] Remove some now-dead exception code Date: Wed, 13 Feb 2019 21:29:00 -0000 Message-Id: <20190213212927.9474-17-tom@tromey.com> In-Reply-To: <20190213212927.9474-1-tom@tromey.com> References: <20190213212927.9474-1-tom@tromey.com> X-SW-Source: 2019-02/txt/msg00196.txt.bz2 After the rewriting to use try/catch, some of the exception code is now unused. This patch removes that code. gdb/ChangeLog 2019-02-13 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 15b59f4dd94..d2ec1994844 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; -} - /* Copy the 'gdb_exception' portion of FROM to TO. */ static void diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h index d4b30104239..245807c68d6 100644 --- a/gdb/common/common-exceptions.h +++ b/gdb/common/common-exceptions.h @@ -125,10 +125,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 @@ -140,24 +136,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 \ { \ @@ -176,40 +169,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. */ -- 2.17.2