* [PATCH] libstdc++: Add wrapper for internal uses of std::terminate
@ 2021-10-08 11:23 Jonathan Wakely
2021-10-11 19:38 ` Jonathan Wakely
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Wakely @ 2021-10-08 11:23 UTC (permalink / raw)
To: libstdc++, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
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 <exception>.
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 <exception> 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 <exception> just for one
function declaration. Any objections or better ideas?
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 4663 bytes --]
commit 79cd06f3072fd8a68b8636f7d11bb42e62eaa6fa
Author: Jonathan Wakely <jwakely@redhat.com>
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 <exception>.
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 <exception> 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 <bits/chrono.h>
#ifdef _GLIBCXX_HAVE_LINUX_FUTEX
-#include <exception> // std::terminate
#include <sys/time.h>
#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 <exception>
+ // 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 <exception> // std::terminate
# include <cerrno> // errno, EINTR, EAGAIN etc.
# include <limits.h> // SEM_VALUE_MAX
# include <semaphore.h> // 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 <bits/c++config.h>
-#include <exception> // std::terminate
#include <iosfwd> // std::basic_ostream
#include <tuple> // std::tuple
#include <bits/functional_hash.h> // 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"
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] libstdc++: Add wrapper for internal uses of std::terminate
2021-10-08 11:23 [PATCH] libstdc++: Add wrapper for internal uses of std::terminate Jonathan Wakely
@ 2021-10-11 19:38 ` Jonathan Wakely
2021-10-13 9:44 ` [committed] libstdc++: Ensure language linkage of std::__terminate() Jonathan Wakely
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Wakely @ 2021-10-11 19:38 UTC (permalink / raw)
To: libstdc++, gcc-patches
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 <exception>.
>
>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 <exception> 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 <exception> just for one
>function declaration. Any objections or better ideas?
I've pushed this to trunk now.
>commit 79cd06f3072fd8a68b8636f7d11bb42e62eaa6fa
>Author: Jonathan Wakely <jwakely@redhat.com>
>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 <exception>.
>
> 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 <exception> 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 <bits/chrono.h>
>
> #ifdef _GLIBCXX_HAVE_LINUX_FUTEX
>-#include <exception> // std::terminate
> #include <sys/time.h>
> #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 <exception>
>+ // 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 <exception> // std::terminate
> # include <cerrno> // errno, EINTR, EAGAIN etc.
> # include <limits.h> // SEM_VALUE_MAX
> # include <semaphore.h> // 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 <bits/c++config.h>
>
>-#include <exception> // std::terminate
> #include <iosfwd> // std::basic_ostream
> #include <tuple> // std::tuple
> #include <bits/functional_hash.h> // 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"
^ permalink raw reply [flat|nested] 3+ messages in thread* [committed] libstdc++: Ensure language linkage of std::__terminate()
2021-10-11 19:38 ` Jonathan Wakely
@ 2021-10-13 9:44 ` Jonathan Wakely
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Wakely @ 2021-10-13 9:44 UTC (permalink / raw)
To: libstdc++, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
On 11/10/21 20:38 +0100, Jonathan Wakely wrote:
>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 <exception>.
>>
>>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 <exception> 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 <exception> just for one
>>function declaration. Any objections or better ideas?
>
>I've pushed this to trunk now.
And now I've pushed this fix for it too.
Tested x86_64-linux.
[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 1078 bytes --]
commit c1b6c360fcf3fc1c0045c7358d61a83c91b6fa25
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Wed Oct 13 10:35:44 2021
libstdc++: Ensure language linkage of std::__terminate()
This is needed because people still find it necessary to do:
extern "C" {
#include <stdlib.h>
}
libstdc++-v3/ChangeLog:
* include/bits/c++config (__terminate): Add extern "C++".
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index b76ffeb2562..a6495809671 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -296,7 +296,7 @@ namespace std
// This allows the library to terminate without including all of <exception>
// and without making the declaration of std::terminate visible to users.
- __attribute__ ((__noreturn__, __always_inline__))
+ extern "C++" __attribute__ ((__noreturn__, __always_inline__))
inline void __terminate() _GLIBCXX_USE_NOEXCEPT
{
void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__));
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-13 9:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-08 11:23 [PATCH] libstdc++: Add wrapper for internal uses of std::terminate Jonathan Wakely
2021-10-11 19:38 ` Jonathan Wakely
2021-10-13 9:44 ` [committed] libstdc++: Ensure language linkage of std::__terminate() Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).