diff options
| author | Dmitry Prokoptsev <dprokoptsev@gmail.com> | 2015-04-27 19:44:30 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-04-27 20:44:30 +0100 |
| commit | f5eedc39151dca5788a9b070bf72a806db69e57a (patch) | |
| tree | 83450d7ed57dab0a3dbd17d3b4a4fe0700ea4b8b | |
| parent | 2f6bd6eb67a11faef36ab3420cf6783de15e4760 (diff) | |
| download | gcc-f5eedc39151dca5788a9b070bf72a806db69e57a.zip gcc-f5eedc39151dca5788a9b070bf72a806db69e57a.tar.gz gcc-f5eedc39151dca5788a9b070bf72a806db69e57a.tar.bz2 | |
re PR libstdc++/62258 (uncaught_exception() equals to `true' after rethrow_exception())
2015-04-27 Dmitry Prokoptsev <dprokoptsev@gmail.com>
Michael Hanselmann <public@hansmi.ch>
PR libstdc++/62258
* libsupc++/eh_ptr.cc (rethrow_exception): Increment count of
uncaught exceptions.
* testsuite/18_support/exception_ptr/62258.cc: New.
Co-Authored-By: Michael Hanselmann <public@hansmi.ch>
From-SVN: r222480
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_ptr.cc | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc | 61 |
3 files changed, 72 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b42e85c..3402ee8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2015-04-27 Dmitry Prokoptsev <dprokoptsev@gmail.com> + Michael Hanselmann <public@hansmi.ch> + + PR libstdc++/62258 + * libsupc++/eh_ptr.cc (rethrow_exception): Increment count of + uncaught exceptions. + * testsuite/18_support/exception_ptr/62258.cc: New. + 2015-04-27 Jonathan Wakely <jwakely@redhat.com> * doc/xml/manual/extensions.xml: Add cross-reference. diff --git a/libstdc++-v3/libsupc++/eh_ptr.cc b/libstdc++-v3/libsupc++/eh_ptr.cc index 685c9e0..dae9246 100644 --- a/libstdc++-v3/libsupc++/eh_ptr.cc +++ b/libstdc++-v3/libsupc++/eh_ptr.cc @@ -245,6 +245,9 @@ std::rethrow_exception(std::exception_ptr ep) __GXX_INIT_DEPENDENT_EXCEPTION_CLASS(dep->unwindHeader.exception_class); dep->unwindHeader.exception_cleanup = __gxx_dependent_exception_cleanup; + __cxa_eh_globals *globals = __cxa_get_globals (); + globals->uncaughtExceptions += 1; + #ifdef _GLIBCXX_SJLJ_EXCEPTIONS _Unwind_SjLj_RaiseException (&dep->unwindHeader); #else diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc new file mode 100644 index 0000000..3734f19 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc @@ -0,0 +1,61 @@ +// { dg-options "-std=gnu++11" } +// { dg-require-atomic-builtins "" } + +// Copyright (C) 2015 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/>. + +// PR libstdc++/62258 + +#include <exception> +#include <testsuite_hooks.h> + +struct check_on_destruct +{ + ~check_on_destruct(); +}; + +check_on_destruct::~check_on_destruct() +{ + VERIFY(std::uncaught_exception()); +} + +int main () +{ + VERIFY(!std::uncaught_exception()); + + try + { + check_on_destruct check; + + try + { + throw 1; + } + catch (...) + { + VERIFY(!std::uncaught_exception()); + + std::rethrow_exception(std::current_exception()); + } + } + catch (...) + { + VERIFY(!std::uncaught_exception()); + } + + VERIFY(!std::uncaught_exception()); +} |