From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 6EED03858024; Mon, 11 Oct 2021 19:37:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6EED03858024 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4329] libstdc++: Add wrapper for internal uses of std::terminate X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 247bac507e63b32d4dc23ef1c55f300aafea24c6 X-Git-Newrev: 250ddf4c0b44de26e9c6cab237c7e248e408e95c Message-Id: <20211011193738.6EED03858024@sourceware.org> Date: Mon, 11 Oct 2021 19:37:38 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2021 19:37:38 -0000 https://gcc.gnu.org/g:250ddf4c0b44de26e9c6cab237c7e248e408e95c commit r12-4329-g250ddf4c0b44de26e9c6cab237c7e248e408e95c Author: Jonathan Wakely Date: Fri Oct 8 11:35:53 2021 +0100 libstdc++: Add wrapper for internal uses of std::terminate This adds an inline wrapper for std::terminate that doesn't add the declaration of std::terminate to namespace std. This allows the library to terminate without including all of . libstdc++-v3/ChangeLog: * include/bits/atomic_timed_wait.h: Remove unused header. * include/bits/c++config (std:__terminate): Define. * include/bits/semaphore_base.h: Remove and use __terminate instead of terminate. * include/bits/std_thread.h: Likewise. * libsupc++/eh_terminate.cc (std::terminate): Use qualified-id to call __cxxabiv1::__terminate. Diff: --- libstdc++-v3/include/bits/atomic_timed_wait.h | 1 - libstdc++-v3/include/bits/c++config | 9 +++++++++ libstdc++-v3/include/bits/semaphore_base.h | 9 ++++----- libstdc++-v3/include/bits/std_thread.h | 5 ++--- libstdc++-v3/libsupc++/eh_terminate.cc | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/include/bits/atomic_timed_wait.h b/libstdc++-v3/include/bits/atomic_timed_wait.h index 64c1ba62a3e..efbe3da8b6c 100644 --- a/libstdc++-v3/include/bits/atomic_timed_wait.h +++ b/libstdc++-v3/include/bits/atomic_timed_wait.h @@ -40,7 +40,6 @@ #include #ifdef _GLIBCXX_HAVE_LINUX_FUTEX -#include // std::terminate #include #endif diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 69343a25533..b76ffeb2562 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -293,6 +293,15 @@ namespace std #if __cplusplus >= 201103L typedef decltype(nullptr) nullptr_t; #endif + + // This allows the library to terminate without including all of + // and without making the declaration of std::terminate visible to users. + __attribute__ ((__noreturn__, __always_inline__)) + inline void __terminate() _GLIBCXX_USE_NOEXCEPT + { + void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__)); + terminate(); + } } #define _GLIBCXX_USE_DUAL_ABI diff --git a/libstdc++-v3/include/bits/semaphore_base.h b/libstdc++-v3/include/bits/semaphore_base.h index 2c8d7576894..afd636704e8 100644 --- a/libstdc++-v3/include/bits/semaphore_base.h +++ b/libstdc++-v3/include/bits/semaphore_base.h @@ -40,7 +40,6 @@ #endif // __cpp_lib_atomic_wait #ifdef _GLIBCXX_HAVE_POSIX_SEMAPHORE -# include // std::terminate # include // errno, EINTR, EAGAIN etc. # include // SEM_VALUE_MAX # include // sem_t, sem_init, sem_wait, sem_post etc. @@ -80,7 +79,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (__err && (errno == EINTR)) continue; else if (__err) - std::terminate(); + std::__terminate(); else break; } @@ -97,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else if (__err && (errno == EAGAIN)) return false; else if (__err) - std::terminate(); + std::__terminate(); else break; } @@ -111,7 +110,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { auto __err = sem_post(&_M_semaphore); if (__err) - std::terminate(); + std::__terminate(); } } @@ -138,7 +137,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION else if (errno == ETIMEDOUT || errno == EINVAL) return false; else - std::terminate(); + std::__terminate(); } else break; diff --git a/libstdc++-v3/include/bits/std_thread.h b/libstdc++-v3/include/bits/std_thread.h index 2a500bf1777..801033b00ad 100644 --- a/libstdc++-v3/include/bits/std_thread.h +++ b/libstdc++-v3/include/bits/std_thread.h @@ -35,7 +35,6 @@ #if __cplusplus >= 201103L #include -#include // std::terminate #include // std::basic_ostream #include // std::tuple #include // std::hash @@ -149,7 +148,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ~thread() { if (joinable()) - std::terminate(); + std::__terminate(); } thread(const thread&) = delete; @@ -162,7 +161,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION thread& operator=(thread&& __t) noexcept { if (joinable()) - std::terminate(); + std::__terminate(); swap(__t); return *this; } diff --git a/libstdc++-v3/libsupc++/eh_terminate.cc b/libstdc++-v3/libsupc++/eh_terminate.cc index e5d37770dc5..af257b63369 100644 --- a/libstdc++-v3/libsupc++/eh_terminate.cc +++ b/libstdc++-v3/libsupc++/eh_terminate.cc @@ -55,7 +55,7 @@ __cxxabiv1::__terminate (std::terminate_handler handler) throw () void std::terminate () throw() { - __terminate (get_terminate ()); + __cxxabiv1::__terminate (get_terminate ()); } void