| Message ID | 4E95797E.5040904@oracle.com |
|---|---|
| State | New |
| Headers | show |
On 10/12/2011 07:26 AM, Paolo Carlini wrote: > + delattrs > + = build_tree_list (get_identifier ("externally_visible"), > + build_tree_list (NULL_TREE, integer_one_node)); Why integer_one_node? Jason
On 10/12/2011 02:18 PM, Jason Merrill wrote: > On 10/12/2011 07:26 AM, Paolo Carlini wrote: >> + delattrs >> + = build_tree_list (get_identifier ("externally_visible"), >> + build_tree_list (NULL_TREE, integer_one_node)); > > Why integer_one_node? To be honest? No idea, I copied what pre-existed for operator new. Shall I test (NULL_TREE, NULL_TREE)?? Paolo.
On Wed, Oct 12, 2011 at 2:29 PM, Paolo Carlini <paolo.carlini@oracle.com> wrote: > On 10/12/2011 02:18 PM, Jason Merrill wrote: >> >> On 10/12/2011 07:26 AM, Paolo Carlini wrote: >>> >>> + delattrs >>> + = build_tree_list (get_identifier ("externally_visible"), >>> + build_tree_list (NULL_TREE, integer_one_node)); >> >> Why integer_one_node? > > To be honest? No idea, I copied what pre-existed for operator new. Shall I > test (NULL_TREE, NULL_TREE)?? build_tree_list (get_identifier ("externally_visible"), NULL_TREE) > Paolo. > >
Index: decl.c =================================================================== --- decl.c (revision 179842) +++ decl.c (working copy) @@ -3654,7 +3654,7 @@ cxx_init_decl_processing (void) current_lang_name = lang_name_cplusplus; { - tree newattrs; + tree newattrs, delattrs; tree newtype, deltype; tree ptr_ftype_sizetype; tree new_eh_spec; @@ -3687,9 +3687,16 @@ cxx_init_decl_processing (void) newattrs = build_tree_list (get_identifier ("alloc_size"), build_tree_list (NULL_TREE, integer_one_node)); + newattrs + = chainon (newattrs, build_tree_list + (get_identifier ("externally_visible"), NULL_TREE)); newtype = cp_build_type_attribute_variant (ptr_ftype_sizetype, newattrs); newtype = build_exception_variant (newtype, new_eh_spec); - deltype = build_exception_variant (void_ftype_ptr, empty_except_spec); + delattrs + = build_tree_list (get_identifier ("externally_visible"), + build_tree_list (NULL_TREE, integer_one_node)); + deltype = cp_build_type_attribute_variant (void_ftype_ptr, delattrs); + deltype = build_exception_variant (deltype, empty_except_spec); push_cp_library_fn (NEW_EXPR, newtype); push_cp_library_fn (VEC_NEW_EXPR, newtype); global_delete_fndecl = push_cp_library_fn (DELETE_EXPR, deltype);
Hi, thus, per the discussion in the audit trail, I'm proceeding with decorating with __attribute__((externally_visible)) both the 8 new and delete in <new>, and the 4 pre-declared by the C++ front-end. The below is what I regression tested successfully, together with the library bits, on x86_64-linux. I'm also attaching, for convenience, the library work (I took the occasion to adjust noexcept vs throw(), etc, otherwise the patch would be tiny) What do you think? Thanks, Paolo. //////////////////////// 2011-10-12 Paolo Carlini <paolo.carlini@oracle.com> PR c++/50594 * decl.c (cxx_init_decl_processing): Add __attribute__((externally_visible)) to operator new and operator delete library fn. Index: include/bits/c++config =================================================================== --- include/bits/c++config (revision 179842) +++ include/bits/c++config (working copy) @@ -103,9 +103,11 @@ # ifdef __GXX_EXPERIMENTAL_CXX0X__ # define _GLIBCXX_NOEXCEPT noexcept # define _GLIBCXX_USE_NOEXCEPT noexcept +# define _GLIBCXX_THROW(_EXC) # else # define _GLIBCXX_NOEXCEPT # define _GLIBCXX_USE_NOEXCEPT throw() +# define _GLIBCXX_THROW(_EXC) throw(_EXC) # endif #endif Index: libsupc++/del_op.cc =================================================================== --- libsupc++/del_op.cc (revision 179842) +++ libsupc++/del_op.cc (working copy) @@ -1,6 +1,7 @@ // Boilerplate support routines for -*- C++ -*- dynamic memory management. -// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2007, 2009 Free Software Foundation +// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2007, 2009, 2010, 2011 +// Free Software Foundation // // This file is part of GCC. // @@ -41,7 +42,7 @@ #include "new" _GLIBCXX_WEAK_DEFINITION void -operator delete(void* ptr) throw () +operator delete(void* ptr) _GLIBCXX_USE_NOEXCEPT { if (ptr) std::free(ptr); Index: libsupc++/new_opv.cc =================================================================== --- libsupc++/new_opv.cc (revision 179842) +++ libsupc++/new_opv.cc (working copy) @@ -1,6 +1,7 @@ // Boilerplate support routines for -*- C++ -*- dynamic memory management. -// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009 Free Software Foundation +// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009, 2010, 2011 +// Free Software Foundation // // This file is part of GCC. // @@ -27,7 +28,7 @@ #include "new" _GLIBCXX_WEAK_DEFINITION void* -operator new[] (std::size_t sz) throw (std::bad_alloc) +operator new[] (std::size_t sz) _GLIBCXX_THROW (std::bad_alloc) { return ::operator new(sz); } Index: libsupc++/new_op.cc =================================================================== --- libsupc++/new_op.cc (revision 179842) +++ libsupc++/new_op.cc (working copy) @@ -42,7 +42,7 @@ extern new_handler __new_handler; _GLIBCXX_WEAK_DEFINITION void * -operator new (std::size_t sz) throw (std::bad_alloc) +operator new (std::size_t sz) _GLIBCXX_THROW (std::bad_alloc) { void *p; Index: libsupc++/del_opv.cc =================================================================== --- libsupc++/del_opv.cc (revision 179842) +++ libsupc++/del_opv.cc (working copy) @@ -1,6 +1,7 @@ // Boilerplate support routines for -*- C++ -*- dynamic memory management. -// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009 Free Software Foundation +// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009, 2010, 2011 +// Free Software Foundation // // This file is part of GCC. // @@ -27,7 +28,7 @@ #include "new" _GLIBCXX_WEAK_DEFINITION void -operator delete[] (void *ptr) throw () +operator delete[] (void *ptr) _GLIBCXX_USE_NOEXCEPT { ::operator delete (ptr); } Index: libsupc++/del_opnt.cc =================================================================== --- libsupc++/del_opnt.cc (revision 179842) +++ libsupc++/del_opnt.cc (working copy) @@ -1,6 +1,7 @@ // Boilerplate support routines for -*- C++ -*- dynamic memory management. -// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009 Free Software Foundation +// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009, 2010, 2011 +// Free Software Foundation // // This file is part of GCC. // @@ -29,7 +30,7 @@ extern "C" void free (void *); _GLIBCXX_WEAK_DEFINITION void -operator delete (void *ptr, const std::nothrow_t&) throw () +operator delete (void *ptr, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT { free (ptr); } Index: libsupc++/new =================================================================== --- libsupc++/new (revision 179842) +++ libsupc++/new (working copy) @@ -1,7 +1,7 @@ // The -*- C++ -*- dynamic memory management header. // Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -// 2003, 2004, 2005, 2006, 2007, 2009, 2010 +// 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation // This file is part of GCC. @@ -90,22 +90,32 @@ * Placement new and delete signatures (take a memory address argument, * does nothing) may not be replaced by a user's program. */ -void* operator new(std::size_t) throw (std::bad_alloc); -void* operator new[](std::size_t) throw (std::bad_alloc); -void operator delete(void*) throw(); -void operator delete[](void*) throw(); -void* operator new(std::size_t, const std::nothrow_t&) throw(); -void* operator new[](std::size_t, const std::nothrow_t&) throw(); -void operator delete(void*, const std::nothrow_t&) throw(); -void operator delete[](void*, const std::nothrow_t&) throw(); +void* operator new(std::size_t) _GLIBCXX_THROW (std::bad_alloc) + __attribute__((__externally_visible__)); +void* operator new[](std::size_t) _GLIBCXX_THROW (std::bad_alloc) + __attribute__((__externally_visible__)); +void operator delete(void*) _GLIBCXX_USE_NOEXCEPT + __attribute__((__externally_visible__)); +void operator delete[](void*) _GLIBCXX_USE_NOEXCEPT + __attribute__((__externally_visible__)); +void* operator new(std::size_t, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT + __attribute__((__externally_visible__)); +void* operator new[](std::size_t, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT + __attribute__((__externally_visible__)); +void operator delete(void*, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT + __attribute__((__externally_visible__)); +void operator delete[](void*, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT + __attribute__((__externally_visible__)); // Default placement versions of operator new. -inline void* operator new(std::size_t, void* __p) throw() { return __p; } -inline void* operator new[](std::size_t, void* __p) throw() { return __p; } +inline void* operator new(std::size_t, void* __p) _GLIBCXX_USE_NOEXCEPT +{ return __p; } +inline void* operator new[](std::size_t, void* __p) _GLIBCXX_USE_NOEXCEPT +{ return __p; } // Default placement versions of operator delete. -inline void operator delete (void*, void*) throw() { } -inline void operator delete[](void*, void*) throw() { } +inline void operator delete (void*, void*) _GLIBCXX_USE_NOEXCEPT { } +inline void operator delete[](void*, void*) _GLIBCXX_USE_NOEXCEPT { } //@} } // extern "C++" Index: libsupc++/new_opvnt.cc =================================================================== --- libsupc++/new_opvnt.cc (revision 179842) +++ libsupc++/new_opvnt.cc (working copy) @@ -1,6 +1,7 @@ // Boilerplate support routines for -*- C++ -*- dynamic memory management. -// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009 Free Software Foundation +// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009, 2010, 2011 +// Free Software Foundation // // This file is part of GCC. // @@ -27,7 +28,8 @@ #include "new" _GLIBCXX_WEAK_DEFINITION void* -operator new[] (std::size_t sz, const std::nothrow_t& nothrow) throw() +operator new[] (std::size_t sz, const std::nothrow_t& nothrow) + _GLIBCXX_USE_NOEXCEPT { return ::operator new(sz, nothrow); } Index: libsupc++/new_opnt.cc =================================================================== --- libsupc++/new_opnt.cc (revision 179842) +++ libsupc++/new_opnt.cc (working copy) @@ -34,7 +34,7 @@ extern new_handler __new_handler; _GLIBCXX_WEAK_DEFINITION void * -operator new (std::size_t sz, const std::nothrow_t&) throw() +operator new (std::size_t sz, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT { void *p; Index: libsupc++/del_opvnt.cc =================================================================== --- libsupc++/del_opvnt.cc (revision 179842) +++ libsupc++/del_opvnt.cc (working copy) @@ -1,6 +1,7 @@ // Boilerplate support routines for -*- C++ -*- dynamic memory management. -// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009 Free Software Foundation +// Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009, 2010, 2011 +// Free Software Foundation // // This file is part of GCC. // @@ -27,7 +28,7 @@ #include "new" _GLIBCXX_WEAK_DEFINITION void -operator delete[] (void *ptr, const std::nothrow_t&) throw () +operator delete[] (void *ptr, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT { ::operator delete (ptr); } Index: testsuite/18_support/50594.cc =================================================================== --- testsuite/18_support/50594.cc (revision 0) +++ testsuite/18_support/50594.cc (revision 0) @@ -0,0 +1,72 @@ +// { dg-options "-fwhole-program" } + +// Copyright (C) 2011 Free Software Foundation +// +// 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 <new> +#include <string> +#include <cstdlib> +#include <testsuite_hooks.h> + +bool user_new_called; +bool user_delete_called; + +void* operator new(std::size_t n) +#ifndef __GXX_EXPERIMENTAL_CXX0X__ + throw(std::bad_alloc) +#endif +{ + user_new_called = true; + + void* p = std::malloc(n); + + if (!p) + throw std::bad_alloc(); + + return p; +} + +void operator delete(void* p) +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + noexcept +#else + throw() +#endif +{ + user_delete_called = true; + + std::free(p); +} + +// libstdc++/50594 +void test01() +{ + bool test __attribute__((unused)) = true; + + { + std::string s = "Hello World."; + } + + VERIFY( user_new_called ); + VERIFY( user_delete_called ); +} + +int main() +{ + test01(); + return 0; +}