From: Jan Hubicka Date: Wed, 28 Jun 2023 09:45:15 +0000 (+0200) Subject: Add cold attribute to throw wrappers and terminate X-Git-Tag: basepoints/gcc-15~7982 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45c53768b6fa3d737ae818e31d3c50da62e0ad2b;p=thirdparty%2Fgcc.git Add cold attribute to throw wrappers and terminate PR middle-end/109849 * include/bits/c++config (std::__terminate): Mark cold. * include/bits/functexcept.h: Mark everything as cold. * libsupc++/exception: Mark terminate and unexpected as cold. --- diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 009a017b048f..dd47f274d5ff 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -320,7 +320,7 @@ namespace std extern "C++" __attribute__ ((__noreturn__, __always_inline__)) inline void __terminate() _GLIBCXX_USE_NOEXCEPT { - void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__)); + void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__,__cold__)); terminate(); } #pragma GCC visibility pop diff --git a/libstdc++-v3/include/bits/functexcept.h b/libstdc++-v3/include/bits/functexcept.h index 89972baf2c9b..c43ca82b9530 100644 --- a/libstdc++-v3/include/bits/functexcept.h +++ b/libstdc++-v3/include/bits/functexcept.h @@ -57,61 +57,61 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Helper for exception objects in void - __throw_bad_cast(void) __attribute__((__noreturn__)); + __throw_bad_cast(void) __attribute__((__noreturn__,__cold__)); void - __throw_bad_typeid(void) __attribute__((__noreturn__)); + __throw_bad_typeid(void) __attribute__((__noreturn__,__cold__)); // Helpers for exception objects in void - __throw_logic_error(const char*) __attribute__((__noreturn__)); + __throw_logic_error(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_domain_error(const char*) __attribute__((__noreturn__)); + __throw_domain_error(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_invalid_argument(const char*) __attribute__((__noreturn__)); + __throw_invalid_argument(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_length_error(const char*) __attribute__((__noreturn__)); + __throw_length_error(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_out_of_range(const char*) __attribute__((__noreturn__)); + __throw_out_of_range(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_out_of_range_fmt(const char*, ...) __attribute__((__noreturn__)) + __throw_out_of_range_fmt(const char*, ...) __attribute__((__noreturn__,__cold__)) __attribute__((__format__(__gnu_printf__, 1, 2))); void - __throw_runtime_error(const char*) __attribute__((__noreturn__)); + __throw_runtime_error(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_range_error(const char*) __attribute__((__noreturn__)); + __throw_range_error(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_overflow_error(const char*) __attribute__((__noreturn__)); + __throw_overflow_error(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_underflow_error(const char*) __attribute__((__noreturn__)); + __throw_underflow_error(const char*) __attribute__((__noreturn__,__cold__)); // Helpers for exception objects in void - __throw_ios_failure(const char*) __attribute__((__noreturn__)); + __throw_ios_failure(const char*) __attribute__((__noreturn__,__cold__)); void - __throw_ios_failure(const char*, int) __attribute__((__noreturn__)); + __throw_ios_failure(const char*, int) __attribute__((__noreturn__,__cold__)); // Helpers for exception objects in void - __throw_system_error(int) __attribute__((__noreturn__)); + __throw_system_error(int) __attribute__((__noreturn__,__cold__)); // Helpers for exception objects in void - __throw_future_error(int) __attribute__((__noreturn__)); + __throw_future_error(int) __attribute__((__noreturn__,__cold__)); // Helpers for exception objects in void - __throw_bad_function_call() __attribute__((__noreturn__)); + __throw_bad_function_call() __attribute__((__noreturn__,__cold__)); #else // ! HOSTED diff --git a/libstdc++-v3/libsupc++/exception b/libstdc++-v3/libsupc++/exception index a34386e6026a..00a6347ebe52 100644 --- a/libstdc++-v3/libsupc++/exception +++ b/libstdc++-v3/libsupc++/exception @@ -75,7 +75,7 @@ namespace std _GLIBCXX_VISIBILITY(default) /** The runtime will call this function if %exception handling must be * abandoned for any reason. It can also be called by the user. */ - void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__)); + void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__,__cold__)); #if __cplusplus < 201703L || (__cplusplus <= 202002L && _GLIBCXX_USE_DEPRECATED) /// If you write a replacement %unexpected handler, it must be of this type. @@ -104,7 +104,7 @@ namespace std _GLIBCXX_VISIBILITY(default) * @deprecated Removed from the C++ standard in C++17 */ _GLIBCXX11_DEPRECATED - void unexpected() __attribute__ ((__noreturn__)); + void unexpected() __attribute__ ((__noreturn__,__cold__)); #endif /** [18.6.4]/1: 'Returns true after completing evaluation of a