summaryrefslogtreecommitdiff
path: root/libstdc++-v3/src/c++11/condition_variable.cc
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-12-07 15:11:15 +0000
committerJonathan Wakely <jwakely@redhat.com>2021-12-09 22:58:19 +0000
commit9e18a25331fa25c3907249fede65a02c6817b06e (patch)
tree5ed6fb40f31062cac2fa9424215e7e2c3a3fccb1 /libstdc++-v3/src/c++11/condition_variable.cc
parentdb5fa0837e464b595a3d63766060bae1c9ac5ccc (diff)
downloadgcc-9e18a25331fa25c3907249fede65a02c6817b06e.tar.gz
libstdc++: Allow std::condition_variable waits to be cancelled [PR103382]
std::condition_variable::wait(unique_lock<mutex>&) is incorrectly marked noexcept, which means that the __forced_unwind exception used by NPTL cancellation will terminate the process. It should allow exceptions to pass through, so that a thread can be cleanly cancelled when waiting on a condition variable. The new behaviour is exported as a new version of the symbol, to avoid an ABI break for existing code linked to the non-throwing definition of the function. Code linked against older releases will have a reference to the @GLIBCXX_3.4.11 version, andcode compiled against the new libstdc++ will get a reference to the @@GLIBCXX_3.4.30 version. libstdc++-v3/ChangeLog: PR libstdc++/103382 * config/abi/pre/gnu.ver (GLIBCXX_3.4.11): Do not export old symbol if .symver renaming is supported. (GLIBCXX_3.4.30): Export new symbol if .symver renaming is supported. * doc/xml/manual/evolution.xml: Document change. * doc/html/manual/api.html: Regenerate. * include/bits/std_mutex.h (__condvar::wait, __condvar::wait_until): Remove noexcept. * include/std/condition_variable (condition_variable::wait): Likewise. * src/c++11/condition_variable.cc (condition_variable::wait): Likewise. * src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait): Define nothrow wrapper around std::condition_variable::wait and export the old symbol as an alias to it. * testsuite/30_threads/condition_variable/members/103382.cc: New test.
Diffstat (limited to 'libstdc++-v3/src/c++11/condition_variable.cc')
-rw-r--r--libstdc++-v3/src/c++11/condition_variable.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/src/c++11/condition_variable.cc b/libstdc++-v3/src/c++11/condition_variable.cc
index ca7902e0373..2d7b8a19b9d 100644
--- a/libstdc++-v3/src/c++11/condition_variable.cc
+++ b/libstdc++-v3/src/c++11/condition_variable.cc
@@ -36,7 +36,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
condition_variable::~condition_variable() noexcept = default;
void
- condition_variable::wait(unique_lock<mutex>& __lock) noexcept
+ condition_variable::wait(unique_lock<mutex>& __lock)
{
_M_cond.wait(*__lock.mutex());
}