@@ -2229,7 +2229,7 @@ Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el)
2229
2229
* immediately after it.
2230
2230
*/
2231
2231
2232
- #define DFA_RETURN_SUCCESS_ return s - s0
2232
+ #define DFA_RETURN_SUCCESS_ return (s8dfa_ - s0)
2233
2233
#define DFA_RETURN_FAILURE_ return 0
2234
2234
#ifdef HAS_EXTRA_LONG_UTF8
2235
2235
# define DFA_TEASE_APART_FF_ goto tease_apart_FF
@@ -2242,15 +2242,15 @@ Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el)
2242
2242
reject_action , \
2243
2243
incomplete_char_action ) \
2244
2244
STMT_START { \
2245
- const U8 * s = s0; \
2246
- const U8 * const e_ = e; \
2245
+ const U8 * s8dfa_ = s0; \
2246
+ const U8 * const e8dfa_ = e; \
2247
2247
UV state = 0; \
2248
2248
\
2249
- PERL_NON_CORE_CHECK_EMPTY(s, e_); \
2249
+ PERL_NON_CORE_CHECK_EMPTY(s8dfa_, e8dfa_); \
2250
2250
\
2251
2251
do { \
2252
- state = dfa_tab[256 + state + dfa_tab[*s ]]; \
2253
- s ++; \
2252
+ state = dfa_tab[256 + state + dfa_tab[*s8dfa_ ]]; \
2253
+ s8dfa_ ++; \
2254
2254
\
2255
2255
if (state == 0) { /* Accepting state */ \
2256
2256
accept_action ; \
@@ -2259,7 +2259,7 @@ Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el)
2259
2259
if (UNLIKELY (state == 1 )) { /* Rejecting state */ \
2260
2260
reject_action ; \
2261
2261
} \
2262
- } while (s < e_ ); \
2262
+ } while (s8dfa_ < e8dfa_ ); \
2263
2263
\
2264
2264
/* Here, dropped out of loop before end-of-char */ \
2265
2265
incomplete_char_action ; \
0 commit comments