From 7b3be9ba1f558180223d9b84ff189785afff9813 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 17 Dec 2012 02:15:34 +0000 Subject: [PATCH] thread.cc (execute_native_thread_routine): Do not swallow __forced_unwind exceptions. * src/c++11/thread.cc (execute_native_thread_routine): Do not swallow __forced_unwind exceptions. * testsuite/30_threads/thread/native_handle/cancel.cc: New. From-SVN: r194549 --- libstdc++-v3/ChangeLog | 6 +++ libstdc++-v3/src/thread.cc | 7 ++- .../30_threads/thread/native_handle/cancel.cc | 45 +++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3ad3d5b4bc9e..91f540aa8a65 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-12-16 Jonathan Wakely + + * src/c++11/thread.cc (execute_native_thread_routine): Do not swallow + __forced_unwind exceptions. + * testsuite/30_threads/thread/native_handle/cancel.cc: New. + 2012-11-08 Jonathan Wakely * include/profile/iterator_tracker.h (operator++): Fix returning diff --git a/libstdc++-v3/src/thread.cc b/libstdc++-v3/src/thread.cc index c164e8a01610..95d737ddc77a 100644 --- a/libstdc++-v3/src/thread.cc +++ b/libstdc++-v3/src/thread.cc @@ -1,6 +1,6 @@ // thread -*- C++ -*- -// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -25,6 +25,7 @@ #include #include +#include #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) @@ -43,6 +44,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { __t->_M_run(); } + __catch(const __cxxabiv1::__forced_unwind&) + { + __throw_exception_again; + } __catch(...) { std::terminate(); diff --git a/libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc b/libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc new file mode 100644 index 000000000000..26ff4b42bc6b --- /dev/null +++ b/libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc @@ -0,0 +1,45 @@ +// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } } +// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* powerpc-ibm-aix* } } +// { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } } +// { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } +// { dg-require-cstdint "" } +// { dg-require-gthreads "" } +// { dg-require-nanosleep "" } + +// Copyright (C) 2012 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +#include + +void f(std::atomic& started) +{ + started = true; + while (true) + std::this_thread::sleep_for(std::chrono::milliseconds(100)); +} + +int main() +{ + std::atomic started{ false }; + std::thread t(f, std::ref(started)); + while (!started) + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + pthread_cancel(t.native_handle()); + t.join(); +} -- 2.47.2