In perl.git, the branch smoke-me/khw-134329 has been updated <https://perl5.git.perl.org/perl.git/commitdiff/b7365028d37ece23d3543a972317950f8322e7b8?hp=e1054a2e1427d0992e29ba844d35b500ec70bd41>
- Log ----------------------------------------------------------------- commit b7365028d37ece23d3543a972317950f8322e7b8 Author: Karl Williamson <[email protected]> Date: Sat Aug 24 19:18:57 2019 -0600 f commit 23d1d225f7944169cadcc7bbbdb339f9c53a4e7d Author: Karl Williamson <[email protected]> Date: Sat Aug 24 19:17:19 2019 -0600 134325 ----------------------------------------------------------------------- Summary of changes: regcomp.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/regcomp.c b/regcomp.c index 999d6d6062..b6a9dab140 100644 --- a/regcomp.c +++ b/regcomp.c @@ -374,12 +374,8 @@ struct RExC_state_t { #define REQUIRE_BRANCHJ(flagp, restart_retval) \ STMT_START { \ RExC_use_BRANCHJ = 1; \ - if (LIKELY(! IN_PARENS_PASS)) { \ - /* No need to restart the parse immediately if we're \ - * going to reparse anyway to count parens */ \ - *flagp |= RESTART_PARSE; \ - return restart_retval; \ - } \ + *flagp |= RESTART_PARSE; \ + return restart_retval; \ } STMT_END /* Until we have completed the parse, we leave RExC_total_parens at 0 or @@ -12174,15 +12170,15 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth) lastbr = br; while (*RExC_parse == '|') { if (RExC_use_BRANCHJ) { - bool silence_gcc; + bool shut_gcc_up; ender = reganode(pRExC_state, LONGJMP, 0); /* Append to the previous. */ - silence_gcc = REGTAIL(pRExC_state, - REGNODE_OFFSET(NEXTOPER(NEXTOPER(REGNODE_p(lastbr)))), - ender); - PERL_UNUSED_VAR(silence_gcc); + shut_gcc_up = REGTAIL(pRExC_state, + REGNODE_OFFSET(NEXTOPER(NEXTOPER(REGNODE_p(lastbr)))), + ender); + PERL_UNUSED_VAR(shut_gcc_up); } nextchar(pRExC_state); if (freeze_paren) { @@ -12293,10 +12289,10 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth) is_nothing= 0; } else if (op == BRANCHJ) { - bool silence_gcc = REGTAIL_STUDY(pRExC_state, - REGNODE_OFFSET(NEXTOPER(NEXTOPER(br))), - ender); - PERL_UNUSED_VAR(silence_gcc); + bool shut_gcc_up = REGTAIL_STUDY(pRExC_state, + REGNODE_OFFSET(NEXTOPER(NEXTOPER(br))), + ender); + PERL_UNUSED_VAR(shut_gcc_up); /* for now we always disable this optimisation * / if ( OP(NEXTOPER(NEXTOPER(br))) != NOTHING || regnext(NEXTOPER(NEXTOPER(br))) != REGNODE_p(ender)) -- Perl5 Master Repository
