X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/2e0b8fbeab3502bee36f25825c3cdd0d075c4fd3..ffdb8b167ec4e9c0f37371dfd7b0abb01e413f90:/inline_invlist.c

diff --git a/inline_invlist.c b/inline_invlist.c
index ced42d8..1aea9f7 100644
--- a/inline_invlist.c
+++ b/inline_invlist.c
@@ -13,15 +13,21 @@
 #define ELEMENT_RANGE_MATCHES_INVLIST(i) (! ((i) & 1))
 #define PREV_RANGE_MATCHES_INVLIST(i) (! ELEMENT_RANGE_MATCHES_INVLIST(i))
 
-PERL_STATIC_INLINE STRLEN*
-S__get_invlist_len_addr(pTHX_ SV* invlist)
+/* This converts to/from our UVs to what the SV code is expecting: bytes. */
+#define TO_INTERNAL_SIZE(x) ((x) * sizeof(UV))
+#define FROM_INTERNAL_SIZE(x) ((x)/ sizeof(UV))
+
+PERL_STATIC_INLINE bool*
+S_get_invlist_offset_addr(pTHX_ SV* invlist)
 {
-    /* Return the address of the UV that contains the current number
-     * of used elements in the inversion list */
+    /* Return the address of the field that says whether the inversion list is
+     * offset (it contains 1) or not (contains 0) */
+
+    PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR;
 
-    PERL_ARGS_ASSERT__GET_INVLIST_LEN_ADDR;
+    assert(SvTYPE(invlist) == SVt_INVLIST);
 
-    return &(LvTARGLEN(invlist));
+    return &(((XINVLIST*) SvANY(invlist))->is_offset);
 }
 
 PERL_STATIC_INLINE UV
@@ -32,7 +38,11 @@ S__invlist_len(pTHX_ SV* const invlist)
 
     PERL_ARGS_ASSERT__INVLIST_LEN;
 
-    return *_get_invlist_len_addr(invlist);
+    assert(SvTYPE(invlist) == SVt_INVLIST);
+
+    return (SvCUR(invlist) == 0)
+           ? 0
+           : FROM_INTERNAL_SIZE(SvCUR(invlist)) - *get_invlist_offset_addr(invlist);
 }
 
 PERL_STATIC_INLINE bool
@@ -47,4 +57,11 @@ S__invlist_contains_cp(pTHX_ SV* const invlist, const UV cp)
     return index >= 0 && ELEMENT_RANGE_MATCHES_INVLIST(index);
 }
 
+#   if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGEXEC_C)
+
+/* These symbols are only needed later in regcomp.c */
+#       undef TO_INTERNAL_SIZE
+#       undef FROM_INTERNAL_SIZE
+#   endif
+
 #endif