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

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: r194539
This commit is contained in:
Jonathan Wakely 2012-12-16 20:52:47 +00:00 committed by Jonathan Wakely
parent 6180209821
commit 5f2862cf63
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-16 Jonathan Wakely <jwakely.gcc@gmail.com>
* 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-12-14 Steve Ellcey <sellcey@mips.com> 2012-12-14 Steve Ellcey <sellcey@mips.com>
* testsuite/21_strings/basic_string/append/wchar_t/3.cc: Shrink * testsuite/21_strings/basic_string/append/wchar_t/3.cc: Shrink

5
libstdc++-v3/src/c++11/thread.cc
View File

@ -26,6 +26,7 @@
#include <thread> #include <thread>
#include <system_error> #include <system_error>
#include <cerrno> #include <cerrno>
#include <cxxabi_forced.h>
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
@ -80,6 +81,10 @@ namespace std _GLIBCXX_VISIBILITY(default)
{ {
__t->_M_run(); __t->_M_run();
} }
__catch(const __cxxabiv1::__forced_unwind&)
{
__throw_exception_again;
}
__catch(...) __catch(...)
{ {
std::terminate(); std::terminate();

44
libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc Normal file
View File

@ -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();
}