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 /libstdc++-v3/libsupc++ | |
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
Diffstat (limited to 'libstdc++-v3/libsupc++')
-rw-r--r-- | libstdc++-v3/libsupc++/eh_ptr.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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 |