find_by_class: Use utf8_to-uv_or_die not utf8_to_uvchr_buf

Author: khwilliamson

regexec.c

@@ -2409,7 +2409,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
         REXEC_FBC_UTF8_CLASS_SCAN(
               (   (U8) NATIVE_UTF8_TO_I8(*s) >= ANYOF_FLAGS(c)
                && _invlist_contains_cp(anyofh_list,
-                                       utf8_to_uvchr_buf((U8 *) s,
+                                       utf8_to_uv_or_die((U8 *) s,
                                                          (U8 *) strend,
                                                          NULL))));
         break;
@@ -2423,7 +2423,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
             anyofh_list = GET_ANYOFH_INVLIST(prog, c);
             REXEC_FBC_FIND_NEXT_UTF8_BYTE_SCAN(first_byte,
                    _invlist_contains_cp(anyofh_list,
-                                           utf8_to_uvchr_buf((U8 *) s,
+                                           utf8_to_uv_or_die((U8 *) s,
                                                               (U8 *) strend,
                                                               NULL)));
         }
@@ -2451,7 +2451,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
                                 LOWEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(c)),
                                 HIGHEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(c)))
                    && _invlist_contains_cp(anyofh_list,
-                                           utf8_to_uvchr_buf((U8 *) s,
+                                           utf8_to_uv_or_die((U8 *) s,
                                                               (U8 *) strend,
                                                               NULL))));
         break;
@@ -2464,7 +2464,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
                         /* Note FLAGS is the string length in this regnode */
                         ((struct regnode_anyofhs *) c)->string + FLAGS(c),
                         _invlist_contains_cp(anyofh_list,
-                                             utf8_to_uvchr_buf((U8 *) s,
+                                             utf8_to_uv_or_die((U8 *) s,
                                                                (U8 *) strend,
                                                                NULL)));
         break;
@@ -2479,7 +2479,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
       case ANYOFR_t8_p8:
         REXEC_FBC_UTF8_CLASS_SCAN(
                             (   NATIVE_UTF8_TO_I8(*s) >= ANYOF_FLAGS(c)
-                             && withinCOUNT(utf8_to_uvchr_buf((U8 *) s,
+                             && withinCOUNT(utf8_to_uv_or_die((U8 *) s,
                                                               (U8 *) strend,
                                                               NULL),
                                             ANYOFRbase(c), ANYOFRdelta(c))));
@@ -2497,7 +2497,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
             U8 first_byte = FLAGS(c);
 
             REXEC_FBC_FIND_NEXT_UTF8_BYTE_SCAN(first_byte,
-                                withinCOUNT(utf8_to_uvchr_buf((U8 *) s,
+                                withinCOUNT(utf8_to_uv_or_die((U8 *) s,
                                                               (U8 *) strend,
                                                               NULL),
                                             ANYOFRbase(c), ANYOFRdelta(c)));
@@ -3213,7 +3213,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
             REXEC_FBC_UTF8_CLASS_SCAN(
                         to_complement ^ cBOOL(_invlist_contains_cp(
                                                 PL_XPosix_ptrs[classnum],
-                                                utf8_to_uvchr_buf((U8 *) s,
+                                                utf8_to_uv_or_die((U8 *) s,
                                                                 (U8 *) strend,
                                                                 NULL))));
             break;