mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-18 16:44:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Fix std::exception_ptr regressions [PR103630]

Browse Source 
This restores support for std::make_exception_ptr<E&> and for using
std::exception_ptr in C++98.

Because the new non-throwing implementation needs to use std::decay to
handle references the original throwing implementation is used for
C++98.

We also need to change the typeid expression so it doesn't yield the
dynamic type when the function parameter is a reference to a polymorphic
type. Otherwise the new exception object could be caught by any handler
matching the dynamic type, even though the actual exception object is
only a copy of the base class, sliced to the static type.

libstdc++-v3/ChangeLog:

	PR libstdc++/103630
	* libsupc++/exception_ptr.h (exception_ptr): Fix exception
	specifications on inline definitions.
	(make_exception_ptr): Decay the template parameter. Use typeid
	of the static type.
	* testsuite/18_support/exception_ptr/103630.cc: New test.
This commit is contained in:
Jonathan Wakely 2021-12-09 13:54:39 +00:00
parent a219139e98
commit a1ca039fc0
2 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libstdc++-v3/libsupc++/exception_ptr.h
View File

@ -39,6 +39,10 @@
#include <typeinfo>
#include <new>
#if __cplusplus >= 201103L
# include <bits/move.h>
#endif
#ifdef _GLIBCXX_EH_PTR_RELOPS_COMPAT
# define _GLIBCXX_EH_PTR_USED __attribute__((__used__))
#else
@ -175,13 +179,14 @@ namespace std
_GLIBCXX_EH_PTR_USED
inline
exception_ptr::exception_ptr() _GLIBCXX_NOEXCEPT
exception_ptr::exception_ptr() _GLIBCXX_USE_NOEXCEPT
: _M_exception_object(0)
{ }
_GLIBCXX_EH_PTR_USED
inline
exception_ptr::exception_ptr(const exception_ptr& __other) _GLIBCXX_NOEXCEPT
exception_ptr::exception_ptr(const exception_ptr& __other)
_GLIBCXX_USE_NOEXCEPT
: _M_exception_object(__other._M_exception_object)
{
if (_M_exception_object)
@ -232,14 +237,16 @@ namespace std
exception_ptr
make_exception_ptr(_Ex __ex) _GLIBCXX_USE_NOEXCEPT
{
#if __cpp_exceptions && __cpp_rtti && !_GLIBCXX_HAVE_CDTOR_CALLABI
#if __cpp_exceptions && __cpp_rtti && !_GLIBCXX_HAVE_CDTOR_CALLABI \
&& __cplusplus >= 201103L
using _Ex2 = typename remove_reference<_Ex>::type;
void* __e = __cxxabiv1::__cxa_allocate_exception(sizeof(_Ex));
(void) __cxxabiv1::__cxa_init_primary_exception(
__e, const_cast<std::type_info*>(&typeid(__ex)),
__exception_ptr::__dest_thunk<_Ex>);
__e, const_cast<std::type_info*>(&typeid(_Ex)),
__exception_ptr::__dest_thunk<_Ex2>);
try
{
::new (__e) _Ex(__ex);
::new (__e) _Ex2(std::forward<_Ex>(__ex));
return exception_ptr(__e);
}
catch(...)

39
libstdc++-v3/testsuite/18_support/exception_ptr/103630.cc Normal file
View File

@ -0,0 +1,39 @@
// { dg-do run }
#include <exception>
#if __cplusplus < 201103L
// std::make_exception_ptr is defined for C++98 as a GNU extension
# include <bits/exception_ptr.h>
#endif
#include <testsuite_hooks.h>
struct B
{
virtual bool derived() const { return false; }
};
struct D : B
{
virtual bool derived() const { return true; }
};
int main()
{
D d;
std::exception_ptr p = std::make_exception_ptr<B&>(d); // PR libstdc++/103630
#if __cpp_exceptions
try
{
std::rethrow_exception(p);
}
catch (const D& d)
{
VERIFY(d.derived()); // PR libstdc++/103630
}
catch (const B& b)
{
VERIFY(!b.derived());
}
#endif
}