From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id B96C33857C4A for ; Mon, 11 Oct 2021 19:38:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B96C33857C4A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-nUJrppEVNYmNhDQOq9LjXw-1; Mon, 11 Oct 2021 15:38:16 -0400 X-MC-Unique: nUJrppEVNYmNhDQOq9LjXw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20A951023F4F; Mon, 11 Oct 2021 19:38:15 +0000 (UTC) Received: from localhost (unknown [10.33.37.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id C36F557CA4; Mon, 11 Oct 2021 19:38:14 +0000 (UTC) Date: Mon, 11 Oct 2021 20:38:13 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [PATCH] libstdc++: Add wrapper for internal uses of std::terminate Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2021 19:38:21 -0000 On 08/10/21 12:23 +0100, Jonathan Wakely wrote: >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. > > >This avoids including a few thousand lines of just for one >function declaration. Any objections or better ideas? I've pushed this to trunk now. >commit 79cd06f3072fd8a68b8636f7d11bb42e62eaa6fa >Author: Jonathan Wakely >Date: Fri Oct 8 11:35:53 2021 > > 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 --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 db6735f308e..a94f173bb2e 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 ()); > } > > #pragma GCC diagnostic ignored "-Wdeprecated-declarations"