This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
toke.c: Make too-long inline function just static
authorKarl Williamson <khw@cpan.org>
Thu, 5 Jan 2017 05:18:24 +0000 (22:18 -0700)
committerKarl Williamson <khw@cpan.org>
Thu, 5 Jan 2017 19:13:36 +0000 (12:13 -0700)
This function is too long to be effectively inlined, so don't request
the compiler to do so.

embed.fnc
proto.h
toke.c

index a73ce5f..656afe5 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -2640,7 +2640,7 @@ s |char*  |force_word     |NN char *start|int token|int check_keyword \
                                |int allow_pack
 s      |SV*    |tokeq          |NN SV *sv
 sR     |char*  |scan_const     |NN char *start
-iR     |SV*    |get_and_check_backslash_N_name|NN const char* s \
+sR     |SV*    |get_and_check_backslash_N_name|NN const char* s \
                                |NN const char* const e
 sR     |char*  |scan_formline  |NN char *s
 sR     |char*  |scan_heredoc   |NN char *s
diff --git a/proto.h b/proto.h
index e1bb218..2fd8a51 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -5506,7 +5506,7 @@ STATIC char*      S_force_version(pTHX_ char *s, int guessing);
 STATIC char*   S_force_word(pTHX_ char *start, int token, int check_keyword, int allow_pack);
 #define PERL_ARGS_ASSERT_FORCE_WORD    \
        assert(start)
-PERL_STATIC_INLINE SV* S_get_and_check_backslash_N_name(pTHX_ const char* s, const char* const e)
+STATIC SV*     S_get_and_check_backslash_N_name(pTHX_ const char* s, const char* const e)
                        __attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME        \
        assert(s); assert(e)
diff --git a/toke.c b/toke.c
index c0e3e27..e6dad0a 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -2543,7 +2543,7 @@ S_sublex_done(pTHX)
     }
 }
 
-PERL_STATIC_INLINE SV*
+STATIC SV*
 S_get_and_check_backslash_N_name(pTHX_ const char* s, const char* const e)
 {
     /* <s> points to first character of interior of \N{}, <e> to one beyond the