diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2786b673637..ac97f0e8d76 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,16 @@ 2019-05-31 Jonathan Wakely + PR libstdc++/90682 + * libsupc++/eh_term_handler.cc: Include eh_term_handler.h to get + definition of _GLIBCXX_DEFAULT_TERM_HANDLER. + * libsupc++/eh_term_handler.h: New header defining + _GLIBCXX_DEFAULT_TERM_HANDLER. + * libsupc++/eh_terminate.cc: Include eh_term_handler.h. + (set_terminate): Restore default handler when argument is null. + (set_unexpected): Likewise. + * testsuite/18_support/set_terminate.cc: New test. + * testsuite/18_support/set_unexpected.cc: New test. + * include/backward/hashtable.h (size_t, ptrdiff_t) (forward_iterator_tag, input_iterator_tag, _Construct, _Destroy) (distance, vector, pair, __iterator_category): Remove diff --git a/libstdc++-v3/libsupc++/eh_term_handler.cc b/libstdc++-v3/libsupc++/eh_term_handler.cc index 6a368c0699e..4b330bc9177 100644 --- a/libstdc++-v3/libsupc++/eh_term_handler.cc +++ b/libstdc++-v3/libsupc++/eh_term_handler.cc @@ -24,21 +24,8 @@ #include #include "unwind-cxx.h" +#include "eh_term_handler.h" -/* We default to the talkative, informative handler in a normal hosted - library. This pulls in the demangler, the dyn-string utilities, and - elements of the I/O library. For a low-memory environment, you can return - to the earlier "silent death" handler by configuring GCC with - --disable-libstdcxx-verbose and rebuilding the library. - In a freestanding environment, we default to this latter approach. */ - -#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE && __cpp_exceptions /* The current installed user handler. */ std::terminate_handler __cxxabiv1::__terminate_handler = - __gnu_cxx::__verbose_terminate_handler; -#else -# include -/* The current installed user handler. */ -std::terminate_handler __cxxabiv1::__terminate_handler = std::abort; -#endif - + _GLIBCXX_DEFAULT_TERM_HANDLER; diff --git a/libstdc++-v3/libsupc++/eh_term_handler.h b/libstdc++-v3/libsupc++/eh_term_handler.h new file mode 100644 index 00000000000..e4774bdf9c5 --- /dev/null +++ b/libstdc++-v3/libsupc++/eh_term_handler.h @@ -0,0 +1,39 @@ +// -*- C++ -*- default std::terminate handler +// Copyright (C) 2002-2019 Free Software Foundation, Inc. +// +// This file is part of GCC. +// +// GCC 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. +// +// GCC 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. +// +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +#include + +/* We default to the talkative, informative handler in a normal hosted + library. This pulls in the demangler, the dyn-string utilities, and + elements of the I/O library. For a low-memory environment, you can return + to the earlier "silent death" handler by configuring GCC with + --disable-libstdcxx-verbose and rebuilding the library. + In a freestanding environment, we default to this latter approach. */ + +#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE && __cpp_exceptions +# define _GLIBCXX_DEFAULT_TERM_HANDLER __gnu_cxx::__verbose_terminate_handler +#else +# include +# define _GLIBCXX_DEFAULT_TERM_HANDLER std::abort +#endif diff --git a/libstdc++-v3/libsupc++/eh_terminate.cc b/libstdc++-v3/libsupc++/eh_terminate.cc index 6acae0593ac..d5f24ea1000 100644 --- a/libstdc++-v3/libsupc++/eh_terminate.cc +++ b/libstdc++-v3/libsupc++/eh_terminate.cc @@ -26,6 +26,7 @@ #include "exception" #include #include "unwind-cxx.h" +#include "eh_term_handler.h" #include #include @@ -73,6 +74,9 @@ std::unexpected () std::terminate_handler std::set_terminate (std::terminate_handler func) throw() { + if (!func) + func = _GLIBCXX_DEFAULT_TERM_HANDLER; + std::terminate_handler old; #if ATOMIC_POINTER_LOCK_FREE > 1 __atomic_exchange (&__terminate_handler, &func, &old, __ATOMIC_ACQ_REL); @@ -100,6 +104,9 @@ std::get_terminate () noexcept std::unexpected_handler std::set_unexpected (std::unexpected_handler func) throw() { + if (!func) + func = std::terminate; + std::unexpected_handler old; #if ATOMIC_POINTER_LOCK_FREE > 1 __atomic_exchange (&__unexpected_handler, &func, &old, __ATOMIC_ACQ_REL); diff --git a/libstdc++-v3/testsuite/18_support/set_terminate.cc b/libstdc++-v3/testsuite/18_support/set_terminate.cc new file mode 100644 index 00000000000..632b9f1974a --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/set_terminate.cc @@ -0,0 +1,56 @@ +// Copyright (C) 2019 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 +// . + +// { dg-do run } + +#include +#include + +void term_handler() { __builtin_abort(); } + +void +test01() +{ + const std::terminate_handler orig = std::get_terminate(); + VERIFY( orig != 0 ); // GNU-specific behaviour + + std::terminate_handler prev = std::set_terminate(term_handler); + VERIFY( std::get_terminate() == term_handler ); + VERIFY( prev == orig ); + + prev = std::set_terminate(orig); + VERIFY( std::get_terminate() == orig ); + VERIFY( prev == term_handler ); +} + +void +test02() +{ + // PR libstdc++/90682 + std::set_terminate(0); // Undefined in C++98, unspecified in C++11 and later + const std::terminate_handler dfault = std::get_terminate(); + VERIFY( dfault != 0 ); // GNU-specific behaviour + const std::terminate_handler prev = std::set_terminate(0); + VERIFY( prev == dfault ); +} + +int +main() +{ + test01(); + test02(); +} diff --git a/libstdc++-v3/testsuite/18_support/set_unexpected.cc b/libstdc++-v3/testsuite/18_support/set_unexpected.cc new file mode 100644 index 00000000000..dac44e616cd --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/set_unexpected.cc @@ -0,0 +1,56 @@ +// Copyright (C) 2019 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 +// . + +// { dg-do run { target { c++98_only || { c++11_only || c++14_only } } } } + +#include +#include + +void unex_handler() { __builtin_abort(); } + +void +test01() +{ + const std::unexpected_handler orig = std::get_unexpected(); + VERIFY( orig == std::terminate ); // GNU-specific behaviour + + std::unexpected_handler prev = std::set_unexpected(unex_handler); + VERIFY( std::get_unexpected() == unex_handler ); + VERIFY( prev == orig ); + + prev = std::set_unexpected(orig); + VERIFY( std::get_unexpected() == orig ); + VERIFY( prev == unex_handler ); +} + +void +test02() +{ + // PR libstdc++/90682 + std::set_unexpected(0); // Undefined in C++98, unspecified in C++11 and C++14 + const std::unexpected_handler dfault = std::get_unexpected(); + VERIFY( dfault == std::terminate ); // GNU-specific behaviour + const std::unexpected_handler prev = std::set_unexpected(0); + VERIFY( prev == dfault ); +} + +int +main() +{ + test01(); + test02(); +}