diff mbox

[PATCHv2] do not throw in std::make_exception_ptr

Message ID 20161021132133.GR2922@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely Oct. 21, 2016, 1:21 p.m. UTC 
On 21/10/16 13:57 +0100, Jonathan Wakely wrote:
>On 21/10/16 15:33 +0300, Gleb Natapov wrote:

>>On Fri, Oct 21, 2016 at 02:58:26PM +0300, Gleb Natapov wrote:

>>>On Fri, Oct 21, 2016 at 12:44:39PM +0100, Jonathan Wakely wrote:

>>>> On 21/10/16 14:36 +0300, Gleb Natapov wrote:

>>>> > On Thu, Oct 20, 2016 at 11:53:49PM -0400, Ryan Burn wrote:

>>>> > > Are exception classes required to support emplace new construction

>>>> > > like that? With this change, Intel's TBB library no longer compiles

>>>> > > because its exception class declares it's own new operator (see

>>>> > > https://github.com/wjakob/tbb/blob/master/include/tbb/tbb_exception.h):

>>>> > >

>>>> > Can you test this patch please:

>>>>

>>>> That doesn't help, the overloaded new still prevents placement new.

>>>> Dammit.

>>>>

>>>Hmm, are you sure. This program compiles for me (while fails without ::):

>>>

>>Looks like tbb also compiles and pass tests.

>

>Bah! I didn't include <new> in my test.

>

>I'll make that change, thanks.


Tested powerpc64le-linux, committed to trunk.
diff mbox

Patch

commit 1e88a5c65a6158462d3703869766f973db91527f
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Oct 21 14:04:16 2016 +0100

    Use global operator new in std::make_exception_ptr
    
    	* libsupc++/exception_ptr.h (make_exception_ptr): Qualify new.
    	* testsuite/18_support/exception_ptr/make_exception_ptr_2.cc: New
    	test.

diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h
index 21e4e8b..a47a585 100644
--- a/libstdc++-v3/libsupc++/exception_ptr.h
+++ b/libstdc++-v3/libsupc++/exception_ptr.h
@@ -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;
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr_2.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr_2.cc
new file mode 100644
index 0000000..3787777
--- /dev/null
+++ b/libstdc++-v3/testsuite/18_support/exception_ptr/make_exception_ptr_2.cc
@@ -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;
+}