From d930626fc0b0d369578440a9907a516915a079d1 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Tue, 16 Feb 2021 10:05:35 -0700 Subject: [PATCH] locale.c: Don't ask a static fcn to be inlined It's too complicated to really be inlined, and the compiler can figure things out itself given it is a static function --- embed.fnc | 2 +- locale.c | 2 +- proto.h | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/embed.fnc b/embed.fnc index 6940674857f2..bbd3198d27be 100644 --- a/embed.fnc +++ b/embed.fnc @@ -3224,7 +3224,7 @@ ST |const char*|my_langinfo|const nl_item item|bool toggle # else ST |const char*|my_langinfo|const int item|bool toggle # endif -iTR |const char *|save_to_buffer|NULLOK const char * string \ +STR |const char *|save_to_buffer|NULLOK const char * string \ |NULLOK const char **buf \ |NULLOK Size_t *buf_size \ |const Size_t offset diff --git a/locale.c b/locale.c index c45e0f1ce8b2..07c38b2c2e07 100644 --- a/locale.c +++ b/locale.c @@ -2606,7 +2606,7 @@ Perl_setlocale(const int category, const char * locale) #ifdef USE_LOCALE -PERL_STATIC_INLINE const char * +STATIC const char * S_save_to_buffer(const char * string, const char **buf, Size_t *buf_size, const Size_t offset) { diff --git a/proto.h b/proto.h index 1443d18933a2..8e986b34f777 100644 --- a/proto.h +++ b/proto.h @@ -5142,11 +5142,9 @@ STATIC void S_new_numeric(pTHX_ const char* newnum); #define PERL_ARGS_ASSERT_NEW_NUMERIC STATIC void S_restore_switched_locale(pTHX_ const int category, const char * const original_locale); #define PERL_ARGS_ASSERT_RESTORE_SWITCHED_LOCALE -#ifndef PERL_NO_INLINE_FUNCTIONS -PERL_STATIC_INLINE const char * S_save_to_buffer(const char * string, const char **buf, Size_t *buf_size, const Size_t offset) +STATIC const char * S_save_to_buffer(const char * string, const char **buf, Size_t *buf_size, const Size_t offset) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SAVE_TO_BUFFER -#endif STATIC void S_set_numeric_radix(pTHX_ const bool use_locale); #define PERL_ARGS_ASSERT_SET_NUMERIC_RADIX