From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id ACB4C3858C83; Wed, 19 Oct 2022 20:29:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ACB4C3858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666211362; bh=qcA9GDqZ6uIer5EUktdFfv9SD35kOk3m/RyI4jsdBHc=; h=From:To:Subject:Date:From; b=M+JM7U3b9Lb8ONuQ9JerP5G7+z38dcvNLkcqWGmh2miMpf2HJdE+0k/z/laxw62Pz TyaO0mIk3o5OSGZnilT6Kh3vLV9B9A64ZeyuTa9NQyCCpUJO4W/dT5OM3I32CvJFNL Oj4SvYd6sZXbqJGReN5oKCW1oxIIP0H++FhMeSiM= 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 r12-8848] libstdc++: eh_globals: gthreads: reset _S_init before deleting key X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: e8bd12887e5f242bc45c9df14384db052e885d80 X-Git-Newrev: 362e56d042f2d37337eea50b97b993f5ac6db86d Message-Id: <20221019202922.ACB4C3858C83@sourceware.org> Date: Wed, 19 Oct 2022 20:29:22 +0000 (GMT) List-Id: https://gcc.gnu.org/g:362e56d042f2d37337eea50b97b993f5ac6db86d commit r12-8848-g362e56d042f2d37337eea50b97b993f5ac6db86d 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. (cherry picked from commit a33dda016e5acf9c6325ce8a72a1b0238130374e) 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;