From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 115397 invoked by alias); 27 Feb 2019 20:19:03 -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 114879 invoked by uid 89); 27 Feb 2019 20:19:00 -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=necessity, scenes, 1856 X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.119) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 27 Feb 2019 20:18:58 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway34.websitewelcome.com (Postfix) with ESMTP id D3B5911889AD for ; Wed, 27 Feb 2019 14:18:56 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id z5fMg8rasdnCez5fMg58b3; Wed, 27 Feb 2019 14:18:56 -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=xGogQwZL9tdS4+oAW7duXzl3VuO1yjbVROiwaTyO4Gk=; b=kT60SEpD0TJ14hy9Q6Oq1Fymzs gBDSOsM2Hg1wDEJNKLUeAwk6gF/V8HfadJLK80/jjET0jOvL2eB2OOJAQtQ5KisQDLibdBcjGHyxV 9jMNvnpvNRN9TZVMiy27EgK/O; Received: from 75-166-85-218.hlrn.qwest.net ([75.166.85.218]:36364 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gz5fM-004Fi1-LA; Wed, 27 Feb 2019 14:18:56 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 14/22] Simplify exception handling Date: Wed, 27 Feb 2019 20:19:00 -0000 Message-Id: <20190227201849.32210-15-tom@tromey.com> In-Reply-To: <20190227201849.32210-1-tom@tromey.com> References: <20190227201849.32210-1-tom@tromey.com> X-SW-Source: 2019-02/txt/msg00525.txt.bz2 Now that cleanups have been removed, TRY/CATCH can't be SJLJ-based any more. This patch simplifies the exception handling code, by removing the non-working variants. Note that the "pure" C++ exception handling code is removed as well; I think the route forward must be to change exceptions to be self-destructing, so that try_scope_depth can simply be removed. Some longjmp-based code remains, as it is needed to throw an exception through readline. gdb/ChangeLog 2019-02-27 Tom Tromey * common/common-exceptions.h (GDB_XCPT_SJMP, GDB_XCPT_TRY) (GDB_XCPT_RAW_TRY, GDB_XCPT): Remove. (TRY, CATCH, END_CATCH): Remove some definitions. * common/common-exceptions.c: Don't use GDB_XCPT. (catcher_list_size): Remove. (throw_exception, throw_it): Simplify. --- gdb/ChangeLog | 9 +++++++ gdb/common/common-exceptions.c | 36 -------------------------- gdb/common/common-exceptions.h | 46 +--------------------------------- 3 files changed, 10 insertions(+), 81 deletions(-) diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c index 4e67e898bda..c3529c989fd 100644 --- a/gdb/common/common-exceptions.c +++ b/gdb/common/common-exceptions.c @@ -54,26 +54,6 @@ struct catcher /* Where to go for throw_exception(). */ static struct catcher *current_catcher; -#if GDB_XCPT == GDB_XCPT_SJMP - -/* Return length of current_catcher list. */ - -static int -catcher_list_size (void) -{ - int size; - struct catcher *catcher; - - for (size = 0, catcher = current_catcher; - catcher != NULL; - catcher = catcher->prev) - ++size; - - return size; -} - -#endif - jmp_buf * exceptions_state_mc_init (void) { @@ -205,8 +185,6 @@ exceptions_state_mc_action_iter_1 (void) return exceptions_state_mc (CATCH_ITER_1); } -#if GDB_XCPT != GDB_XCPT_SJMP - /* How many nested TRY blocks we have. See exception_messages and throw_it. */ @@ -248,8 +226,6 @@ gdb_exception_sliced_copy (struct gdb_exception *to, const struct gdb_exception *to = *from; } -#endif /* !GDB_XCPT_SJMP */ - /* Return EXCEPTION to the nearest containing CATCH_SJLJ block. */ void @@ -263,8 +239,6 @@ throw_exception_sjlj (struct gdb_exception exception) longjmp (current_catcher->buf, exception.reason); } -#if GDB_XCPT != GDB_XCPT_SJMP - /* Implementation of throw_exception that uses C++ try/catch. */ static ATTRIBUTE_NORETURN void @@ -288,16 +262,10 @@ throw_exception_cxx (struct gdb_exception exception) gdb_assert_not_reached ("invalid return reason"); } -#endif - void throw_exception (struct gdb_exception exception) { -#if GDB_XCPT == GDB_XCPT_SJMP - throw_exception_sjlj (exception); -#else throw_exception_cxx (exception); -#endif } /* A stack of exception messages. @@ -321,11 +289,7 @@ throw_it (enum return_reason reason, enum errors error, const char *fmt, { struct gdb_exception e; char *new_message; -#if GDB_XCPT == GDB_XCPT_SJMP - int depth = catcher_list_size (); -#else int depth = try_scope_depth; -#endif gdb_assert (depth > 0); diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h index 471e7c5cf81..6cc09eab938 100644 --- a/gdb/common/common-exceptions.h +++ b/gdb/common/common-exceptions.h @@ -115,22 +115,6 @@ struct gdb_exception const char *message; }; -/* The different exception mechanisms that TRY/CATCH can map to. */ - -/* Make GDB exceptions use setjmp/longjmp behind the scenes. */ -#define GDB_XCPT_SJMP 1 - -/* Make GDB exceptions use try/catch behind the scenes. */ -#define GDB_XCPT_TRY 2 - -/* Specify this mode to build with TRY/CATCH mapped directly to raw - try/catch. GDB won't work correctly, but building that way catches - code tryin to break/continue out of the try block, along with - spurious code between the TRY and the CATCH block. */ -#define GDB_XCPT_RAW_TRY 3 - -#define GDB_XCPT GDB_XCPT_TRY - /* Functions to drive the sjlj-based exceptions state machine. Though declared here by necessity, these functions should be considered internal to the exceptions subsystem and not used other than via @@ -141,13 +125,11 @@ 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); -/* Same, but for the C++ try/catch-based TRY/CATCH mechanism. */ +/* For the C++ try/catch-based TRY/CATCH mechanism. */ -#if GDB_XCPT != GDB_XCPT_SJMP extern void *exception_try_scope_entry (void); extern void exception_try_scope_exit (void *saved_state); extern void exception_rethrow (void) ATTRIBUTE_NORETURN; -#endif /* Macro to wrap up standard try/catch behavior. @@ -196,19 +178,6 @@ extern void exception_rethrow (void) ATTRIBUTE_NORETURN; #define END_CATCH_SJLJ \ } -#if GDB_XCPT == GDB_XCPT_SJMP - -/* If using SJLJ-based exceptions for all exceptions, then provide - standard aliases. */ - -#define TRY TRY_SJLJ -#define CATCH CATCH_SJLJ -#define END_CATCH END_CATCH_SJLJ - -#endif /* GDB_XCPT_SJMP */ - -#if GDB_XCPT == GDB_XCPT_TRY || GDB_XCPT == GDB_XCPT_RAW_TRY - /* Prevent error/quit during TRY from calling cleanups established prior to here. This pops out the scope in either case of normal exit or exception exit. */ @@ -226,8 +195,6 @@ struct exception_try_scope void *saved_state; }; -#if GDB_XCPT == GDB_XCPT_TRY - /* We still need to wrap TRY/CATCH in C++ so that cleanups and C++ exceptions can coexist. @@ -263,15 +230,6 @@ struct exception_try_scope } \ } -#else - -#define TRY try -#define CATCH(EXCEPTION, MASK) \ - catch (struct gdb_exception ## _ ## MASK &EXCEPTION) -#define END_CATCH - -#endif - /* 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. */ @@ -288,8 +246,6 @@ struct gdb_exception_RETURN_MASK_QUIT : public gdb_exception_RETURN_MASK_ALL { }; -#endif /* GDB_XCPT_TRY || GDB_XCPT_RAW_TRY */ - /* An exception type that inherits from both std::bad_alloc and a gdb exception. This is necessary because operator new can only throw std::bad_alloc, and OTOH, we want exceptions thrown due to memory -- 2.17.2