From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 9D9C83895FC3; Fri, 4 Nov 2022 14:05:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D9C83895FC3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667570755; bh=7Ikjx92UHpdig4ZbJlvWpixUnR92sBzjSWOnYR0jDPE=; h=From:To:Subject:Date:From; b=Wvl5moreDvvFlQYX8OZKkXKEpUoHEHmZGbskzeFPb02gNvRZuvSn7GMs+9CpFQNxw yNRoRjU1vd5iNQgkLxg9WdTjJKD6tW+1QiimJvKlKVuHB7RlUlqfaLPJs0NCT9SeMh n2IOaaoFAIORBaCvW8dbB6cdoN4DYwP7LvuLOTrU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-3685] libstdc++: Simplify lifetime of eh_globals variable [PR107500] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f505f37a8e5a7646af4038b5c46f72d8a05dc7f0 X-Git-Newrev: 418999fe382c608facf57f96b53a9cb12d2fdd20 Message-Id: <20221104140555.9D9C83895FC3@sourceware.org> Date: Fri, 4 Nov 2022 14:05:55 +0000 (GMT) List-Id: https://gcc.gnu.org/g:418999fe382c608facf57f96b53a9cb12d2fdd20 commit r13-3685-g418999fe382c608facf57f96b53a9cb12d2fdd20 Author: Jonathan Wakely Date: Thu Nov 3 11:48:57 2022 +0000 libstdc++: Simplify lifetime of eh_globals variable [PR107500] Since this is a trivial type, we probably don't need to do anything to ensure it's still accessible after other static dtors. libstdc++-v3/ChangeLog: PR libstdc++/107500 * libsupc++/eh_globals.cc (eh_globals): Remove immortalizing wrapper. (__cxxabiv1::__cxa_get_globals_fast): Adjust. (__cxxabiv1::__cxa_get_globals): Adjust. Diff: --- libstdc++-v3/libsupc++/eh_globals.cc | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/libsupc++/eh_globals.cc b/libstdc++-v3/libsupc++/eh_globals.cc index 12abfc10521..74e8a454ecc 100644 --- a/libstdc++-v3/libsupc++/eh_globals.cc +++ b/libstdc++-v3/libsupc++/eh_globals.cc @@ -70,18 +70,8 @@ __cxxabiv1::__cxa_get_globals() _GLIBCXX_NOTHROW namespace { - struct constant_init - { - union { - __cxa_eh_globals obj; - }; - constexpr constant_init() : obj() { } - - ~constant_init() { /* do nothing, union member is not destroyed */ } - }; - // Single-threaded fallback buffer. - __constinit constant_init eh_globals; + __constinit __cxa_eh_globals eh_globals; } #if __GTHREADS @@ -142,7 +132,7 @@ __cxxabiv1::__cxa_get_globals_fast() _GLIBCXX_NOTHROW if (init._S_init) g = static_cast<__cxa_eh_globals*>(__gthread_getspecific(init._M_key)); else - g = &eh_globals.obj; + g = &eh_globals; return g; } @@ -167,7 +157,7 @@ __cxxabiv1::__cxa_get_globals() _GLIBCXX_NOTHROW } } else - g = &eh_globals.obj; + g = &eh_globals; return g; } @@ -175,11 +165,11 @@ __cxxabiv1::__cxa_get_globals() _GLIBCXX_NOTHROW extern "C" __cxa_eh_globals* __cxxabiv1::__cxa_get_globals_fast() _GLIBCXX_NOTHROW -{ return &eh_globals.obj; } +{ return &eh_globals; } extern "C" __cxa_eh_globals* __cxxabiv1::__cxa_get_globals() _GLIBCXX_NOTHROW -{ return &eh_globals.obj; } +{ return &eh_globals; } #endif