FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/62258 (uncaught_exception() equals to `true' after rethrow_exception())

Browse source 
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
This commit is contained in:
Dmitry Prokoptsev 2015-04-27 19:44:30 +00:00 • committed by Jonathan Wakely
parent 2f6bd6eb67
commit f5eedc3915
3 changed files with 72 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -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> 2015-04-27 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/extensions.xml: Add cross-reference. * doc/xml/manual/extensions.xml: Add cross-reference.

3
libstdc++-v3/libsupc++/eh_ptr.cc
View file

@ -245,6 +245,9 @@ std::rethrow_exception(std::exception_ptr ep)
__GXX_INIT_DEPENDENT_EXCEPTION_CLASS(dep->unwindHeader.exception_class); __GXX_INIT_DEPENDENT_EXCEPTION_CLASS(dep->unwindHeader.exception_class);
dep->unwindHeader.exception_cleanup = __gxx_dependent_exception_cleanup; dep->unwindHeader.exception_cleanup = __gxx_dependent_exception_cleanup;
__cxa_eh_globals *globals = __cxa_get_globals ();
globals->uncaughtExceptions += 1;
#ifdef _GLIBCXX_SJLJ_EXCEPTIONS #ifdef _GLIBCXX_SJLJ_EXCEPTIONS
_Unwind_SjLj_RaiseException (&dep->unwindHeader); _Unwind_SjLj_RaiseException (&dep->unwindHeader);
#else #else

61
libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc Normal file
View file

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