From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 8194A3835C24; Wed, 22 Jun 2022 02:11:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8194A3835C24 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-1201] libstdc++: eh_globals: gthreads: reset _S_init before deleting key X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/heads/master X-Git-Oldrev: f129628e8f261b66a34a9626e1f5b0293548a6a8 X-Git-Newrev: a33dda016e5acf9c6325ce8a72a1b0238130374e Message-Id: <20220622021159.8194A3835C24@sourceware.org> Date: Wed, 22 Jun 2022 02:11:59 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2022 02:11:59 -0000 https://gcc.gnu.org/g:a33dda016e5acf9c6325ce8a72a1b0238130374e commit r13-1201-ga33dda016e5acf9c6325ce8a72a1b0238130374e Author: Alexandre Oliva Date: Tue Jun 21 23:11:02 2022 -0300 libstdc++: eh_globals: gthreads: reset _S_init before deleting key Clear __eh_globals_init's _S_init in the dtor before deleting the gthread key. This ensures that, in case any code involved in deleting the key interacts with eh_globals, the key that is being deleted won't be used, and the non-thread-specific eh_globals fallback will. for libstdc++-v3/ChangeLog * libsupc++/eh_globals.cc [!_GLIBCXX_HAVE_TLS] (__eh_globals_init::~__eh_globals_init): Clear _S_init first. Diff: --- libstdc++-v3/libsupc++/eh_globals.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/libsupc++/eh_globals.cc b/libstdc++-v3/libsupc++/eh_globals.cc index 768425c0f40..0aadb692a96 100644 --- a/libstdc++-v3/libsupc++/eh_globals.cc +++ b/libstdc++-v3/libsupc++/eh_globals.cc @@ -119,8 +119,13 @@ struct __eh_globals_init ~__eh_globals_init() { if (_S_init) - __gthread_key_delete(_M_key); - _S_init = false; + { + /* Set it before the call, so that, should + __gthread_key_delete throw an exception, it won't rely on + the key being deleted. */ + _S_init = false; + __gthread_key_delete(_M_key); + } } __eh_globals_init(const __eh_globals_init&) = delete;