From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 66B63385840D; Tue, 23 Apr 2024 14:11:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 66B63385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713881505; bh=ZAFdplLsfGbNmkI2mZTO8NHYDGx2LFqhQj+8ESOtOoU=; h=From:To:Subject:Date:From; b=tcT1qXvGy0n90jRmVtb3QYtZmJfHl5bNcXQ+4G6f+CI1j7anvNFUU/gBx6Tgq2rtE oZRCEhmJN8ncK4ZVOjj6XQ6RjlOhN3Epjs3eLBzX7fDVYuk/HXl+Ec56ZvKRRzJVLm xKxN3fHiAOyMPOsUCq1WmxeSCRM0zZ+8urpuNk4Q= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-11341] Objective-C: Default flag_objc_sjlj_exceptions off for NeXT ABI >= 2. X-Act-Checkin: gcc X-Git-Author: Matt Jacobson X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: b907af1ce4966b662ae3d26afa24fa6c3ac468c9 X-Git-Newrev: 895bb1b2eb82e76d3bfc48bf35a0bbafae82d873 Message-Id: <20240423141145.66B63385840D@sourceware.org> Date: Tue, 23 Apr 2024 14:11:45 +0000 (GMT) List-Id: https://gcc.gnu.org/g:895bb1b2eb82e76d3bfc48bf35a0bbafae82d873 commit r11-11341-g895bb1b2eb82e76d3bfc48bf35a0bbafae82d873 Author: Matt Jacobson Date: Thu Jul 29 09:57:23 2021 +0100 Objective-C: Default flag_objc_sjlj_exceptions off for NeXT ABI >= 2. Signed-off-by: Matt Jacobson gcc/c-family/ChangeLog: * c-opts.c (c_common_post_options): Default to flag_objc_sjlj_exceptions = 1 only when flag_objc_abi < 2. gcc/objc/ChangeLog: * objc-next-runtime-abi-02.c (objc_next_runtime_abi_02_init): Warn about and reset flag_objc_sjlj_exceptions regardless of flag_objc_exceptions. (next_runtime_02_initialize): Use a checking assert that flag_objc_sjlj_exceptions is off. (cherry picked from commit 798666392b512a585f0de2983a5d3423e960959e) Diff: --- gcc/c-family/c-opts.c | 4 ++-- gcc/objc/objc-next-runtime-abi-02.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 6f001e0bb6c..5bfa239ec0b 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -852,9 +852,9 @@ c_common_post_options (const char **pfilename) else if (!flag_gnu89_inline && !flag_isoc99) error ("%<-fno-gnu89-inline%> is only supported in GNU99 or C99 mode"); - /* Default to ObjC sjlj exception handling if NeXT runtime. */ + /* Default to ObjC sjlj exception handling if NeXT runtime < v2. */ if (flag_objc_sjlj_exceptions < 0) - flag_objc_sjlj_exceptions = flag_next_runtime; + flag_objc_sjlj_exceptions = (flag_next_runtime && flag_objc_abi < 2); if (flag_objc_exceptions && !flag_objc_sjlj_exceptions) flag_exceptions = 1; diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c index 2f18b04e34a..2a4f87cc726 100644 --- a/gcc/objc/objc-next-runtime-abi-02.c +++ b/gcc/objc/objc-next-runtime-abi-02.c @@ -245,7 +245,7 @@ objc_next_runtime_abi_02_init (objc_runtime_hooks *rthooks) { extern_names = ggc_cleared_vec_alloc (SIZEHASHTABLE); - if (flag_objc_exceptions && flag_objc_sjlj_exceptions) + if (flag_objc_sjlj_exceptions) { inform (UNKNOWN_LOCATION, "%<-fobjc-sjlj-exceptions%> is ignored for " @@ -511,7 +511,7 @@ static void next_runtime_02_initialize (void) objc_getPropertyStruct_decl = NULL_TREE; objc_setPropertyStruct_decl = NULL_TREE; - gcc_assert (!flag_objc_sjlj_exceptions); + gcc_checking_assert (!flag_objc_sjlj_exceptions); /* Although we warn that fobjc-exceptions is required for exceptions code, we carry on and create it anyway. */