git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2011-10-26 23:35:26 +00:00 committed by Jonathan Wakely
parent e7604cc480
commit 28c2f60e96
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2011-10-27 Jonathan Wakely <jwakely.gcc@gmail.com>
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 <jwakely.gcc@gmail.com> 2011-10-25 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/condition_variable (condition_variable_any): Remove * include/std/condition_variable (condition_variable_any): Remove

8
libstdc++-v3/include/std/condition_variable
View File

@ -205,7 +205,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// scoped unlock - unlocks in ctor, re-locks in dtor // scoped unlock - unlocks in ctor, re-locks in dtor
struct _Unlock { struct _Unlock {
explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.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; _Lock& _M_lock;
}; };

1
libstdc++-v3/testsuite/30_threads/condition_variable_any/50862.cc
View File

@ -4,6 +4,7 @@
// { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
// { dg-require-cstdint "" } // { dg-require-cstdint "" }
// { dg-require-gthreads "" } // { dg-require-gthreads "" }
// { dg-require-sched-yield "" }
// Copyright (C) 2011 Free Software Foundation, Inc. // Copyright (C) 2011 Free Software Foundation, Inc.
// //