Patchwork std::thread must rethrow __forced_unwind exceptions

login
register
mail settings
Submitter Jonathan Wakely
Date Dec. 16, 2012, 8:52 p.m.
Message ID <CAH6eHdT1MEPOm9sw7XzT9oEC7awP4--ZSdu6ycFu4pHnEEpa-Q@mail.gmail.com>
Download mbox | patch
Permalink /patch/206738/
State New
Headers show

Comments

Jonathan Wakely - Dec. 16, 2012, 8:52 p.m.
* src/c++11/thread.cc (execute_native_thread_routine): Do not swallow
        __forced_unwind exceptions.
        * testsuite/30_threads/thread/native_handle/cancel.cc: New.

Tested x86_64-linux, committed to trunk, will commit to 4.7 and 4.6
branches asap.
commit 832f7b1b233d68ca635c2356615fd74691a33ee0
Author: Jonathan Wakely <jwakely.gcc@gmail.com>
Date:   Sun Dec 16 03:02:39 2012 +0000

    	* src/c++11/thread.cc (execute_native_thread_routine): Do not swallow
    	__forced_unwind exceptions.
    	* testsuite/30_threads/thread/native_handle/cancel.cc: New.

Patch

diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
index 084be42..fa86a1b 100644
--- a/libstdc++-v3/src/c++11/thread.cc
+++ b/libstdc++-v3/src/c++11/thread.cc
@@ -26,6 +26,7 @@ 
 #include <thread>
 #include <system_error>
 #include <cerrno>
+#include <cxxabi_forced.h>
 
 #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
 
@@ -80,6 +81,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 0000000..96b5791
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc
@@ -0,0 +1,44 @@ 
+// { 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 "" }
+
+// 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
+// <http://www.gnu.org/licenses/>.
+
+#include <pthread.h>
+#include <thread>
+#include <atomic>
+
+void f(std::atomic<bool>& started)
+{
+  started = true;
+  while (true)
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+}
+
+int main()
+{
+  std::atomic<bool> 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();
+}