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

mutex (try_lock): Do not swallow exceptions. 

* include/std/mutex (try_lock): Do not swallow exceptions.
	* testsuite/30_threads/try_lock/4.cc: Fix test.

From-SVN: r215467
This commit is contained in:
Jonathan Wakely 2014-09-22 15:54:35 +01:00 committed by Jonathan Wakely
parent ed26fe9e4a
commit 726d31362a
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2014-09-22 Jonathan Wakely <jwakely@redhat.com>
* include/std/mutex (try_lock): Do not swallow exceptions.
* testsuite/30_threads/try_lock/4.cc: Fix test.
2014-09-22 Jonathan Wakely <jwakely@redhat.com> 2014-09-22 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/54316 PR libstdc++/54316

7
libstdc++-v3/include/std/mutex
View File

@ -630,12 +630,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
int __idx; int __idx;
auto __locks = std::tie(__l1, __l2, __l3...); auto __locks = std::tie(__l1, __l2, __l3...);
__try __try_lock_impl<0>::__do_try_lock(__locks, __idx);
{ __try_lock_impl<0>::__do_try_lock(__locks, __idx); }
__catch(const __cxxabiv1::__forced_unwind&)
{ __throw_exception_again; }
__catch(...)
{ }
return __idx; return __idx;
} }

11
libstdc++-v3/testsuite/30_threads/try_lock/4.cc
View File

@ -133,8 +133,15 @@ void test03()
while (unreliable_lock::throw_on < 3) while (unreliable_lock::throw_on < 3)
{ {
unreliable_lock::count = 0; unreliable_lock::count = 0;
int failed = std::try_lock(l1, l2, l3); try
VERIFY( failed == unreliable_lock::throw_on ); {
std::try_lock(l1, l2, l3);
VERIFY( false );
}
catch (int e)
{
VERIFY( e == unreliable_lock::throw_on );
}
++unreliable_lock::throw_on; ++unreliable_lock::throw_on;
} }
} }