OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use global operator new in std::make_exception_ptr

Browse Source 
* libsupc++/exception_ptr.h (make_exception_ptr): Qualify new.
	* testsuite/18_support/exception_ptr/make_exception_ptr_2.cc: New
	test.

From-SVN: r241404
This commit is contained in:
Jonathan Wakely 2016-10-21 14:21:09 +01:00 committed by Jonathan Wakely
parent de514d407e
commit 6652a944dc
3 changed files with 53 additions and 4 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 @@
2016-10-21 Jonathan Wakely <jwakely@redhat.com>
* libsupc++/exception_ptr.h (make_exception_ptr): Qualify new.
* testsuite/18_support/exception_ptr/make_exception_ptr_2.cc: New
test.
2016-10-20 Jonathan Wakely <jwakely@redhat.com>
* include/backward/auto_ptr.h (__shared_ptr(auto_ptr&&))

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

@ -187,10 +187,10 @@ namespace std
{
#if __cpp_rtti && !_GLIBCXX_HAVE_CDTOR_CALLABI
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>);
new (__e) _Ex(__ex);
(void)__cxxabiv1::__cxa_init_primary_exception(
__e, const_cast<std::type_info*>(&typeid(__ex)),
__exception_ptr::__dest_thunk<_Ex>);
::new (__e) _Ex(__ex);
return exception_ptr(__e);
#else
throw __ex;

43
libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr_2.cc Normal file
View File

@ -0,0 +1,43 @@
// { dg-do run { target c++11 } }
// { dg-require-atomic-builtins "" }
// Copyright (C) 2010-2016 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 <exception>
#include <testsuite_hooks.h>
// https://gcc.gnu.org/ml/libstdc++/2016-10/msg00139.html
struct E {
void* operator new(std::size_t) = delete;
};
void test01()
{
E e;
std::exception_ptr p = std::make_exception_ptr(e);
VERIFY( p );
}
int main()
{
test01();
return 0;
}