Change _invlist to invlist_

The previous spelling is undefined behavior in C

Author: khwilliamson

doop.c

@@ -375,7 +375,7 @@ S_do_trans_count_invmap(pTHX_ SV * const sv, AV * const invmap)
 
         /* Look the code point up in the data structure for this tr/// to get
          * what it maps to */
-        i = _invlist_search(from_invlist, from);
+        i = invlist_search_(from_invlist, from);
         assert(i >= 0);
 
         if (map[i] != (UV) TR_UNLISTED) {
@@ -491,7 +491,7 @@ S_do_trans_invmap(pTHX_ SV * const sv, AV * const invmap)
 
         /* Look the code point up in the data structure for this tr/// to get
          * what it maps to */
-        i = _invlist_search(from_invlist, from);
+        i = invlist_search_(from_invlist, from);
         assert(i >= 0);
 
         to = map[i];

dump.c

@@ -2201,7 +2201,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo
             if (type == SVt_INVLIST) {
                 PerlIO_printf(file, "\n");
                 /* 4 blanks indents 2 beyond the PV, etc */
-                _invlist_dump(file, level, "    ", sv);
+                invlist_dump_(file, level, "    ", sv);
             }
             else {
                 PerlIO_printf(file, "%s", _pv_display_for_dump(d, ptr, SvCUR(sv),

embed.fnc

@@ -4337,11 +4337,11 @@ RS	|Size_t |do_trans_simple|NN SV * const sv			\
 ERTi	|bool * |get_invlist_offset_addr				\
 				|NN SV *invlist
 ERTi	|UV *	|invlist_array	|NN SV * const invlist
-ERTi	|bool	|_invlist_contains_cp					\
+ERTi	|bool	|invlist_contains_cp_					\
 				|NN SV * const invlist			\
 				|const UV cp
-ERTi	|UV	|_invlist_len	|NN SV * const invlist
-ERTXp	|SSize_t|_invlist_search|NN SV * const invlist			\
+ERTi	|UV	|invlist_len_	|NN SV * const invlist
+ERTXp	|SSize_t|invlist_search_|NN SV * const invlist			\
 				|const UV cp
 ERTi	|bool	|is_invlist	|NULLOK const SV * const invlist
 #endif
@@ -4363,24 +4363,24 @@ ERXp	|SV *	|_add_range_to_invlist					\
 				|NULLOK SV *invlist			\
 				|UV start				\
 				|UV end
-m	|void	|_invlist_intersection					\
+m	|void	|invlist_intersection_					\
 				|NN SV * const a			\
 				|NN SV * const b			\
 				|NN SV **i
-EXp	|void	|_invlist_intersection_maybe_complement_2nd		\
+EXp	|void	|invlist_intersection_maybe_complement_2nd_		\
 				|NULLOK SV * const a			\
 				|NN SV * const b			\
 				|const bool complement_b		\
 				|NN SV **i
-EXp	|void	|_invlist_invert|NN SV * const invlist
-m	|void	|_invlist_subtract					\
+EXp	|void	|invlist_invert_|NN SV * const invlist
+m	|void	|invlist_subtract_					\
 				|NN SV * const a			\
 				|NN SV * const b			\
 				|NN SV **result
-Cm	|void	|_invlist_union |NULLOK SV * const a			\
+Cm	|void	|invlist_union_ |NULLOK SV * const a			\
 				|NN SV * const b			\
 				|NN SV **output
-EXp	|void	|_invlist_union_maybe_complement_2nd			\
+EXp	|void	|invlist_union_maybe_complement_2nd_			\
 				|NULLOK SV * const a			\
 				|NN SV * const b			\
 				|const bool complement_b		\
@@ -4443,7 +4443,7 @@ opx	|void	|hv_kill_backrefs					\
 #endif
 #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_OP_C) || \
     defined(PERL_IN_REGCOMP_ANY)
-EXp	|void	|_invlist_dump	|NN PerlIO *file			\
+EXp	|void	|invlist_dump_	|NN PerlIO *file			\
 				|I32 level				\
 				|NN const char * const indent		\
 				|NN SV * const invlist
@@ -5057,7 +5057,7 @@ So	|void	|validate_suid	|NN PerlIO *rsfp
 #endif /* defined(PERL_IN_PERL_C) */
 #if defined(PERL_IN_PERL_C) || defined(PERL_IN_REGCOMP_ANY) || \
     defined(PERL_IN_UTF8_C)
-EXp	|bool	|_invlistEQ	|NN SV * const a			\
+EXp	|bool	|invlistEQ_	|NN SV * const a			\
 				|NN SV * const b			\
 				|const bool complement_b
 ERXp	|SV *	|_new_invlist_C_array					\
@@ -5602,7 +5602,7 @@ ERTi	|IV *	|get_invlist_previous_index_addr			\
 S	|void	|initialize_invlist_guts				\
 				|NN SV *invlist 			\
 				|const Size_t initial_size
-ERTi	|UV *	|_invlist_array_init					\
+ERTi	|UV *	|invlist_array_init_					\
 				|NN SV * const invlist			\
 				|const bool will_have_0
 Ei	|void	|invlist_clear	|NN SV *invlist

embed.h

@@ -1896,11 +1896,11 @@
        defined(PERL_IN_PP_C)      || defined(PERL_IN_REGCOMP_ANY) || \
        defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_TOKE_C)      || \
        defined(PERL_IN_UTF8_C)
-#     define _invlist_contains_cp               S__invlist_contains_cp
-#     define _invlist_len                       S__invlist_len
-#     define _invlist_search                    Perl__invlist_search
 #     define get_invlist_offset_addr            S_get_invlist_offset_addr
 #     define invlist_array                      S_invlist_array
+#     define invlist_contains_cp_               S_invlist_contains_cp_
+#     define invlist_len_                       S_invlist_len_
+#     define invlist_search_                    Perl_invlist_search_
 #     define is_invlist                         S_is_invlist
 #   endif
 #   if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \
@@ -1913,11 +1913,11 @@
 #   if defined(PERL_IN_DOOP_C)      || defined(PERL_IN_OP_C) || \
        defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C)
 #     define _add_range_to_invlist(a,b,c)       Perl__add_range_to_invlist(aTHX_ a,b,c)
-#     define _invlist_intersection_maybe_complement_2nd(a,b,c,d) Perl__invlist_intersection_maybe_complement_2nd(aTHX_ a,b,c,d)
-#     define _invlist_invert(a)                 Perl__invlist_invert(aTHX_ a)
-#     define _invlist_union_maybe_complement_2nd(a,b,c,d) Perl__invlist_union_maybe_complement_2nd(aTHX_ a,b,c,d)
 #     define _new_invlist(a)                    Perl__new_invlist(aTHX_ a)
 #     define _setup_canned_invlist(a,b,c)       Perl__setup_canned_invlist(aTHX_ a,b,c)
+#     define invlist_intersection_maybe_complement_2nd_(a,b,c,d) Perl_invlist_intersection_maybe_complement_2nd_(aTHX_ a,b,c,d)
+#     define invlist_invert_(a)                 Perl_invlist_invert_(aTHX_ a)
+#     define invlist_union_maybe_complement_2nd_(a,b,c,d) Perl_invlist_union_maybe_complement_2nd_(aTHX_ a,b,c,d)
 #   endif
 #   if defined(PERL_IN_DQUOTE_C) || defined(PERL_IN_REGCOMP_C) || \
        defined(PERL_IN_TOKE_C)
@@ -1932,7 +1932,7 @@
 #   endif
 #   if defined(PERL_IN_DUMP_C) || defined(PERL_IN_OP_C) || \
        defined(PERL_IN_REGCOMP_ANY)
-#     define _invlist_dump(a,b,c,d)             Perl__invlist_dump(aTHX_ a,b,c,d)
+#     define invlist_dump_(a,b,c,d)             Perl_invlist_dump_(aTHX_ a,b,c,d)
 #   endif
 #   if defined(PERL_IN_GV_C) || defined(PERL_IN_UNIVERSAL_C)
 #     define gv_stashsvpvn_cached(a,b,c,d)      Perl_gv_stashsvpvn_cached(aTHX_ a,b,c,d)
@@ -1945,8 +1945,8 @@
 #   endif
 #   if defined(PERL_IN_PERL_C) || defined(PERL_IN_REGCOMP_ANY) || \
        defined(PERL_IN_UTF8_C)
-#     define _invlistEQ(a,b,c)                  Perl__invlistEQ(aTHX_ a,b,c)
 #     define _new_invlist_C_array(a)            Perl__new_invlist_C_array(aTHX_ a)
+#     define invlistEQ_(a,b,c)                  Perl_invlistEQ_(aTHX_ a,b,c)
 #   endif
 #   if defined(PERL_IN_PP_C)   || defined(PERL_IN_REGCOMP_ANY) || \
        defined(PERL_IN_TOKE_C) || defined(PERL_IN_UNIVERSAL_C)
@@ -2053,8 +2053,8 @@
 #   endif
 #   if defined(PERL_IN_REGCOMP_INVLIST_C) && !defined(PERL_EXT_RE_BUILD)
 #     define _append_range_to_invlist(a,b,c)    S__append_range_to_invlist(aTHX_ a,b,c)
-#     define _invlist_array_init                S__invlist_array_init
 #     define get_invlist_previous_index_addr    S_get_invlist_previous_index_addr
+#     define invlist_array_init_                S_invlist_array_init_
 #     define invlist_clear(a)                   S_invlist_clear(aTHX_ a)
 #     define invlist_max                        S_invlist_max
 #     define invlist_previous_index             S_invlist_previous_index

ext/B/B.pm

@@ -20,7 +20,7 @@ sub import {
 # walkoptree comes from B.xs
 
 BEGIN {
-    $B::VERSION = '1.89';
+    $B::VERSION = '1.90';
     @B::EXPORT_OK = ();
 
     # Our BOOT code needs $VERSION set, and will append to @EXPORT_OK.

ext/B/B.xs

@@ -1694,7 +1694,7 @@ PPCODE:
         UV len;
 
         len = 0;
-        /* should use _invlist_len (or not) */
+        /* should use invlist_len_ (or not) */
         if (SvCUR(invlist) > 0)
             len = FROM_INTERNAL_SIZE(SvCUR(invlist)); /* - ((XINVLIST*) SvANY(invlist))->is_offset; */ /* <- for iteration */
 

invlist_inline.h

@@ -45,12 +45,12 @@ S_get_invlist_offset_addr(SV* invlist)
 }
 
 PERL_STATIC_INLINE UV
-S__invlist_len(SV* const invlist)
+S_invlist_len_(SV* const invlist)
 {
     /* Returns the current number of elements stored in the inversion list's
      * array */
 
-    PERL_ARGS_ASSERT__INVLIST_LEN;
+    PERL_ARGS_ASSERT_INVLIST_LEN_;
 
     assert(is_invlist(invlist));
 
@@ -60,13 +60,13 @@ S__invlist_len(SV* const invlist)
 }
 
 PERL_STATIC_INLINE bool
-S__invlist_contains_cp(SV* const invlist, const UV cp)
+S_invlist_contains_cp_(SV* const invlist, const UV cp)
 {
     /* Does <invlist> contain code point <cp> as part of the set? */
 
-    IV index = _invlist_search(invlist, cp);
+    IV index = invlist_search_(invlist, cp);
 
-    PERL_ARGS_ASSERT__INVLIST_CONTAINS_CP;
+    PERL_ARGS_ASSERT_INVLIST_CONTAINS_CP_;
 
     return index >= 0 && ELEMENT_RANGE_MATCHES_INVLIST(index);
 }
@@ -82,7 +82,7 @@ S_invlist_array(SV* const invlist)
 
     /* Must not be empty.  If these fail, you probably didn't check for <len>
      * being non-zero before trying to get the array */
-    assert(_invlist_len(invlist));
+    assert(invlist_len_(invlist));
 
     /* The very first element always contains zero, The array begins either
      * there, or if the inversion list is offset, at the element after it.
@@ -139,7 +139,7 @@ S_invlist_highest(SV* const invlist)
      * 0, or if the list is empty.  If this distinction matters to you, check
      * for emptiness before calling this function */
 
-    UV len = _invlist_len(invlist);
+    UV len = invlist_len_(invlist);
     UV *array;
 
     PERL_ARGS_ASSERT_INVLIST_HIGHEST;
@@ -172,7 +172,7 @@ S_invlist_highest_range_start(SV* const invlist)
      * distinction matters to you, check for emptiness before calling this
      * function. */
 
-    UV len = _invlist_len(invlist);
+    UV len = invlist_len_(invlist);
     UV *array;
 
     PERL_ARGS_ASSERT_INVLIST_HIGHEST_RANGE_START;
@@ -249,7 +249,7 @@ S_invlist_iternext(SV* invlist, UV* start, UV* end)
      * will start over at the beginning of the list */
 
     STRLEN* pos = get_invlist_iter_addr(invlist);
-    UV len = _invlist_len(invlist);
+    UV len = invlist_len_(invlist);
     UV *array;
 
     PERL_ARGS_ASSERT_INVLIST_ITERNEXT;
@@ -356,7 +356,7 @@ S_invlist_lowest(SV* const invlist)
      * 0, or if the list is empty.  If this distinction matters to you, check
      * for emptiness before calling this function */
 
-    UV len = _invlist_len(invlist);
+    UV len = invlist_len_(invlist);
     UV *array;
 
     PERL_ARGS_ASSERT_INVLIST_LOWEST;

op.c

@@ -6094,7 +6094,7 @@ Perl_invmap_dump(pTHX_ SV* invlist, UV *map)
 
     const unsigned int indent = 4;
 
-    UV len = _invlist_len(invlist);
+    UV len = invlist_len_(invlist);
     UV * array = invlist_array(invlist);
 
     if (len == 0) {
@@ -6567,7 +6567,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl)
         } /* End of parse through tstr */
 
         /* The inversion list is done; now invert it */
-        _invlist_invert(inverted_tlist);
+        invlist_invert_(inverted_tlist);
 
         /* Now go through the inverted list and create a new tstr for the rest
          * of the routine to use.  Since the UTF-8 version can have ranges, and
@@ -6834,7 +6834,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl)
              * the return value is the index into the list's array of the range
              * that contains <cp>, that is, 'i' such that
              *      array[i] <= cp < * array[i+1] */
-            j = _invlist_search(t_invlist, t_cp);
+            j = invlist_search_(t_invlist, t_cp);
             assert(j >= 0);
             i = j;
 

pp.c

@@ -4593,7 +4593,7 @@ PP_wrapped(pp_uc, 1, 0)
             if (UNLIKELY(in_iota_subscript)) {
                 UV cp = utf8_to_uv_or_die(s, send, NULL);
 
-                if (! _invlist_contains_cp(PL_utf8_mark, cp)) {
+                if (! invlist_contains_cp_(PL_utf8_mark, cp)) {
 
                     /* A non-mark.  Time to output the iota subscript */
                     *d++ = UTF8_TWO_BYTE_HI(GREEK_CAPITAL_LETTER_IOTA);