From: Jonathan Wakely Date: Wed, 26 Oct 2011 23:35:26 +0000 (+0000) Subject: re PR libstdc++/50862 (deadlock in std::condition_variable_any) X-Git-Tag: releases/gcc-4.7.0~2779 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28c2f60e96a3dd100a85b32a91f7a1c0c408fd39;p=thirdparty%2Fgcc.git re PR libstdc++/50862 (deadlock in std::condition_variable_any) PR libstdc++/50862 * include/std/condition_variable (condition_variable_any::wait): Avoid terminating if relocking user mutex throws during stack-unwinding. * testsuite/30_threads/condition_variable_any/50862.cc: Add dg-require. From-SVN: r180549 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1a7d157b4b3e..b7d9618f00eb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2011-10-27 Jonathan Wakely + + PR libstdc++/50862 + * include/std/condition_variable (condition_variable_any::wait): Avoid + terminating if relocking user mutex throws during stack-unwinding. + * testsuite/30_threads/condition_variable_any/50862.cc: Add dg-require. + 2011-10-25 Jonathan Wakely * include/std/condition_variable (condition_variable_any): Remove diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable index efc4a64ef1d2..c4e2080165d7 100644 --- a/libstdc++-v3/include/std/condition_variable +++ b/libstdc++-v3/include/std/condition_variable @@ -205,7 +205,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // scoped unlock - unlocks in ctor, re-locks in dtor struct _Unlock { explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.unlock(); } - ~_Unlock() { _M_lock.lock(); } + ~_Unlock() noexcept(false) + { + if (uncaught_exception()) + __try { _M_lock.lock(); } __catch(...) { } + else + _M_lock.lock(); + } _Lock& _M_lock; }; diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc b/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc index db2a5eb71b28..9ca008681b6e 100644 --- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc +++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc @@ -4,6 +4,7 @@ // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } // { dg-require-cstdint "" } // { dg-require-gthreads "" } +// { dg-require-sched-yield "" } // Copyright (C) 2011 Free Software Foundation, Inc. //