Skip to content

Commit 1284d2c

Browse files
committed
[perl #133468] Silence compiler warning
Commit 1a69c9a 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.
1 parent 0c6023b commit 1284d2c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

embed.fnc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,6 @@ EXpRM |SV* |swash_init |NN const char* pkg|NN const char* name|NN SV* listsv|I32
16971697
EXpM |UV |swash_fetch |NN SV *swash|NN const U8 *ptr|bool do_utf8
16981698
#ifdef PERL_IN_REGCOMP_C
16991699
EiMR |SV* |add_cp_to_invlist |NULLOK SV* invlist|const UV cp
1700-
EiM |void |invlist_set_len|NN SV* const invlist|const UV len|const bool offset
17011700
EiMRn |bool |invlist_is_iterating|NN SV* const invlist
17021701
#ifndef PERL_EXT_RE_BUILD
17031702
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
17061705
EsM |void |invlist_extend |NN SV* const invlist|const UV len
17071706
EsM |void |invlist_replace_list_destroys_src|NN SV *dest|NN SV *src
17081707
EiMRn |IV* |get_invlist_previous_index_addr|NN SV* invlist
1708+
EiM |void |invlist_set_len|NN SV* const invlist|const UV len|const bool offset
17091709
EiMn |void |invlist_set_previous_index|NN SV* const invlist|const IV index
17101710
EiMRn |IV |invlist_previous_index|NN SV* const invlist
17111711
EiMn |void |invlist_trim |NN SV* invlist

embed.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,7 @@
11251125
#define invlist_max S_invlist_max
11261126
#define invlist_previous_index S_invlist_previous_index
11271127
#define invlist_replace_list_destroys_src(a,b) S_invlist_replace_list_destroys_src(aTHX_ a,b)
1128+
#define invlist_set_len(a,b,c) S_invlist_set_len(aTHX_ a,b,c)
11281129
#define invlist_set_previous_index S_invlist_set_previous_index
11291130
#define invlist_trim S_invlist_trim
11301131
# endif
@@ -1195,7 +1196,6 @@
11951196
#define invlist_iterfinish S_invlist_iterfinish
11961197
#define invlist_iterinit S_invlist_iterinit
11971198
#define invlist_iternext S_invlist_iternext
1198-
#define invlist_set_len(a,b,c) S_invlist_set_len(aTHX_ a,b,c)
11991199
#define is_ssc_worth_it S_is_ssc_worth_it
12001200
#define join_exact(a,b,c,d,e,f,g) S_join_exact(aTHX_ a,b,c,d,e,f,g)
12011201
#define make_trie(a,b,c,d,e,f,g,h) S_make_trie(aTHX_ a,b,c,d,e,f,g,h)

proto.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -4194,6 +4194,11 @@ STATIC void S_invlist_replace_list_destroys_src(pTHX_ SV *dest, SV *src);
41944194
#define PERL_ARGS_ASSERT_INVLIST_REPLACE_LIST_DESTROYS_SRC \
41954195
assert(dest); assert(src)
41964196
#ifndef PERL_NO_INLINE_FUNCTIONS
4197+
PERL_STATIC_INLINE void S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset);
4198+
#define PERL_ARGS_ASSERT_INVLIST_SET_LEN \
4199+
assert(invlist)
4200+
#endif
4201+
#ifndef PERL_NO_INLINE_FUNCTIONS
41974202
PERL_STATIC_INLINE void S_invlist_set_previous_index(SV* const invlist, const IV index);
41984203
#define PERL_ARGS_ASSERT_INVLIST_SET_PREVIOUS_INDEX \
41994204
assert(invlist)
@@ -5468,11 +5473,6 @@ STATIC bool S_invlist_iternext(SV* invlist, UV* start, UV* end)
54685473
#define PERL_ARGS_ASSERT_INVLIST_ITERNEXT \
54695474
assert(invlist); assert(start); assert(end)
54705475

5471-
#ifndef PERL_NO_INLINE_FUNCTIONS
5472-
PERL_STATIC_INLINE void S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset);
5473-
#define PERL_ARGS_ASSERT_INVLIST_SET_LEN \
5474-
assert(invlist)
5475-
#endif
54765476
STATIC bool S_is_ssc_worth_it(const RExC_state_t * pRExC_state, const regnode_ssc * ssc);
54775477
#define PERL_ARGS_ASSERT_IS_SSC_WORTH_IT \
54785478
assert(pRExC_state); assert(ssc)

0 commit comments

Comments
 (0)