In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/1284d2c34d8ce8dead280c0d849b6cc826c124bb?hp=0c6023b1f6c90300c0b9526db907cc57fafbbed0>
- Log ----------------------------------------------------------------- commit 1284d2c34d8ce8dead280c0d849b6cc826c124bb Author: Andy Dougherty <[email protected]> Date: Thu Aug 30 12:02:22 2018 -0400 [perl #133468] Silence compiler warning Commit 1a69c9a77a no longer uses S_invlist_set_len in ext/re/re_comp.c, but didn't adjust embed.fnc accordingly. This patch moves that function into the #ifndef PERL_EXT_RE_BUILD block in embed.fnc. It also includes regenerated embed.h and proto.h files. ----------------------------------------------------------------------- Summary of changes: embed.fnc | 2 +- embed.h | 2 +- proto.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/embed.fnc b/embed.fnc index 5164a99ede..7bffdc67ea 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1697,7 +1697,6 @@ EXpRM |SV* |swash_init |NN const char* pkg|NN const char* name|NN SV* listsv|I32 EXpM |UV |swash_fetch |NN SV *swash|NN const U8 *ptr|bool do_utf8 #ifdef PERL_IN_REGCOMP_C EiMR |SV* |add_cp_to_invlist |NULLOK SV* invlist|const UV cp -EiM |void |invlist_set_len|NN SV* const invlist|const UV len|const bool offset EiMRn |bool |invlist_is_iterating|NN SV* const invlist #ifndef PERL_EXT_RE_BUILD EiMRn |UV* |_invlist_array_init |NN SV* const invlist|const bool will_have_0 @@ -1706,6 +1705,7 @@ EsM |void |_append_range_to_invlist |NN SV* const invlist|const UV start|const EsM |void |invlist_extend |NN SV* const invlist|const UV len EsM |void |invlist_replace_list_destroys_src|NN SV *dest|NN SV *src EiMRn |IV* |get_invlist_previous_index_addr|NN SV* invlist +EiM |void |invlist_set_len|NN SV* const invlist|const UV len|const bool offset EiMn |void |invlist_set_previous_index|NN SV* const invlist|const IV index EiMRn |IV |invlist_previous_index|NN SV* const invlist EiMn |void |invlist_trim |NN SV* invlist diff --git a/embed.h b/embed.h index a990f3917a..8e762bc248 100644 --- a/embed.h +++ b/embed.h @@ -1125,6 +1125,7 @@ #define invlist_max S_invlist_max #define invlist_previous_index S_invlist_previous_index #define invlist_replace_list_destroys_src(a,b) S_invlist_replace_list_destroys_src(aTHX_ a,b) +#define invlist_set_len(a,b,c) S_invlist_set_len(aTHX_ a,b,c) #define invlist_set_previous_index S_invlist_set_previous_index #define invlist_trim S_invlist_trim # endif @@ -1195,7 +1196,6 @@ #define invlist_iterfinish S_invlist_iterfinish #define invlist_iterinit S_invlist_iterinit #define invlist_iternext S_invlist_iternext -#define invlist_set_len(a,b,c) S_invlist_set_len(aTHX_ a,b,c) #define is_ssc_worth_it S_is_ssc_worth_it #define join_exact(a,b,c,d,e,f,g) S_join_exact(aTHX_ a,b,c,d,e,f,g) #define make_trie(a,b,c,d,e,f,g,h) S_make_trie(aTHX_ a,b,c,d,e,f,g,h) diff --git a/proto.h b/proto.h index 82349124c4..0e6c76a3bc 100644 --- a/proto.h +++ b/proto.h @@ -4194,6 +4194,11 @@ STATIC void S_invlist_replace_list_destroys_src(pTHX_ SV *dest, SV *src); #define PERL_ARGS_ASSERT_INVLIST_REPLACE_LIST_DESTROYS_SRC \ assert(dest); assert(src) #ifndef PERL_NO_INLINE_FUNCTIONS +PERL_STATIC_INLINE void S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset); +#define PERL_ARGS_ASSERT_INVLIST_SET_LEN \ + assert(invlist) +#endif +#ifndef PERL_NO_INLINE_FUNCTIONS PERL_STATIC_INLINE void S_invlist_set_previous_index(SV* const invlist, const IV index); #define PERL_ARGS_ASSERT_INVLIST_SET_PREVIOUS_INDEX \ assert(invlist) @@ -5468,11 +5473,6 @@ STATIC bool S_invlist_iternext(SV* invlist, UV* start, UV* end) #define PERL_ARGS_ASSERT_INVLIST_ITERNEXT \ assert(invlist); assert(start); assert(end) -#ifndef PERL_NO_INLINE_FUNCTIONS -PERL_STATIC_INLINE void S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset); -#define PERL_ARGS_ASSERT_INVLIST_SET_LEN \ - assert(invlist) -#endif STATIC bool S_is_ssc_worth_it(const RExC_state_t * pRExC_state, const regnode_ssc * ssc); #define PERL_ARGS_ASSERT_IS_SSC_WORTH_IT \ assert(pRExC_state); assert(ssc) -- Perl5 Master Repository
