From 726d31362afc855b41260f0ab7f9318112285587 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 22 Sep 2014 15:54:35 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/mutex | 7 +------ libstdc++-v3/testsuite/30_threads/try_lock/4.cc | 11 +++++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9cbbe19419b..aeb8afcc582 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-09-22 Jonathan Wakely + + * include/std/mutex (try_lock): Do not swallow exceptions. + * testsuite/30_threads/try_lock/4.cc: Fix test. + 2014-09-22 Jonathan Wakely PR libstdc++/54316 diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index f6b851c90b0..d80fa5a4ecd 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -630,12 +630,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { int __idx; auto __locks = std::tie(__l1, __l2, __l3...); - __try - { __try_lock_impl<0>::__do_try_lock(__locks, __idx); } - __catch(const __cxxabiv1::__forced_unwind&) - { __throw_exception_again; } - __catch(...) - { } + __try_lock_impl<0>::__do_try_lock(__locks, __idx); return __idx; } diff --git a/libstdc++-v3/testsuite/30_threads/try_lock/4.cc b/libstdc++-v3/testsuite/30_threads/try_lock/4.cc index 774179826b2..1212b6596e9 100644 --- a/libstdc++-v3/testsuite/30_threads/try_lock/4.cc +++ b/libstdc++-v3/testsuite/30_threads/try_lock/4.cc @@ -133,8 +133,15 @@ void test03() while (unreliable_lock::throw_on < 3) { unreliable_lock::count = 0; - int failed = std::try_lock(l1, l2, l3); - VERIFY( failed == unreliable_lock::throw_on ); + try + { + std::try_lock(l1, l2, l3); + VERIFY( false ); + } + catch (int e) + { + VERIFY( e == unreliable_lock::throw_on ); + } ++unreliable_lock::throw_on; } } -- 2.30.2