procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Simplify __throw_out_of_range_fmt for freestanding

Browse source 
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 <jwakely@redhat.com>

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.
This commit is contained in:
Jonathan Wakely 2021-05-20 18:13:00 +01:00
parent dc1b29508d
commit 44967af830
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/src/c++11/functexcept.cc
View file

@ -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

11
libstdc++-v3/src/c++11/snprintf_lite.cc
View file

@ -24,17 +24,8 @@
// <http://www.gnu.org/licenses/>.
#include <stdarg.h>
#include <stddef.h>
#include <bits/functexcept.h>
#include <bits/locale_facets.h>
namespace std {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _CharT, typename _ValueT>
int
__int_to_char(_CharT* __bufend, _ValueT __v, const _CharT* __lit,
ios_base::fmtflags __flags, bool __dec);
_GLIBCXX_END_NAMESPACE_VERSION
}
namespace __gnu_cxx {