From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 958D83857C5E; Fri, 1 Oct 2021 19:39:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 958D83857C5E 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-4073] libstdc++: Simplify __throw_out_of_range_fmt for freestanding X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: dc1b29508d765b874372f4b1737ac6dc86962506 X-Git-Newrev: 44967af830a8d887f0d7b6848d40e1c0870b6b0e Message-Id: <20211001193920.958D83857C5E@sourceware.org> Date: Fri, 1 Oct 2021 19:39:20 +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: Fri, 01 Oct 2021 19:39:20 -0000 https://gcc.gnu.org/g:44967af830a8d887f0d7b6848d40e1c0870b6b0e commit r12-4073-g44967af830a8d887f0d7b6848d40e1c0870b6b0e Author: Jonathan Wakely Date: Thu May 20 18:13:00 2021 +0100 libstdc++: Simplify __throw_out_of_range_fmt for freestanding There is no point expanding the format string if we're just going to abort instead of throw an exception. And for freestanding or non-verbose builds we shouldn't do it either, to reduce the binary size. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * src/c++11/functexcept.cc (__throw_out_of_range_fmt): Do not expand the format string for freestanding, or non-vebose, or if we're just going to abort anyway. * src/c++11/snprintf_lite.cc: Remove unused header and declaration. Diff: --- libstdc++-v3/src/c++11/functexcept.cc | 8 ++++++-- libstdc++-v3/src/c++11/snprintf_lite.cc | 11 +---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/src/c++11/functexcept.cc b/libstdc++-v3/src/c++11/functexcept.cc index 6f0071391c7..d1570b69f15 100644 --- a/libstdc++-v3/src/c++11/functexcept.cc +++ b/libstdc++-v3/src/c++11/functexcept.cc @@ -88,6 +88,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void __throw_out_of_range_fmt(const char* __fmt, ...) { +#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE && __cpp_exceptions const size_t __len = __builtin_strlen(__fmt); // We expect at most 2 numbers, and 1 short string. The additional // 512 bytes should provide more than enough space for expansion. @@ -96,9 +97,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION va_list __ap; va_start(__ap, __fmt); - __gnu_cxx::__snprintf_lite(__s, __alloca_size, __fmt, __ap); - _GLIBCXX_THROW_OR_ABORT(out_of_range(_(__s))); + __gnu_cxx::__snprintf_lite(__s, __alloca_size, _(__fmt), __ap); + throw out_of_range(__s); va_end(__ap); // Not reached. +#else + __throw_out_of_range(__fmt); +#endif } void diff --git a/libstdc++-v3/src/c++11/snprintf_lite.cc b/libstdc++-v3/src/c++11/snprintf_lite.cc index dcf8421cac2..ffeb7bf64c0 100644 --- a/libstdc++-v3/src/c++11/snprintf_lite.cc +++ b/libstdc++-v3/src/c++11/snprintf_lite.cc @@ -24,17 +24,8 @@ // . #include +#include #include -#include - -namespace std { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - template - int - __int_to_char(_CharT* __bufend, _ValueT __v, const _CharT* __lit, - ios_base::fmtflags __flags, bool __dec); -_GLIBCXX_END_NAMESPACE_VERSION -} namespace __gnu_cxx {