diff options
| -rw-r--r-- | embedvar.h | 1 | ||||
| -rw-r--r-- | intrpvar.h | 2 | ||||
| -rw-r--r-- | pp_ctl.c | 8 | ||||
| -rw-r--r-- | regcomp.c | 5 | ||||
| -rw-r--r-- | sv.c | 5 |
5 files changed, 1 insertions, 20 deletions
diff --git a/embedvar.h b/embedvar.h index 52452617ac..3922855eda 100644 --- a/embedvar.h +++ b/embedvar.h @@ -277,7 +277,6 @@ #define PL_regdummy (vTHX->Iregdummy) #define PL_regex_pad (vTHX->Iregex_pad) #define PL_regex_padav (vTHX->Iregex_padav) -#define PL_reginterp_cnt (vTHX->Ireginterp_cnt) #define PL_registered_mros (vTHX->Iregistered_mros) #define PL_regmatch_slab (vTHX->Iregmatch_slab) #define PL_regmatch_state (vTHX->Iregmatch_state) diff --git a/intrpvar.h b/intrpvar.h index 0124f513cd..ffcac0833a 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -296,8 +296,6 @@ PERLVAR(I, sawampersand, bool) /* must save all match strings */ PERLVAR(I, unsafe, bool) PERLVAR(I, exit_flags, U8) /* was exit() unexpected, etc. */ -PERLVARI(I, reginterp_cnt, I32, 0) /* Whether "Regexp" was interpolated. */ - PERLVAR(I, inplace, char *) PERLVAR(I, e_script, SV *) @@ -69,9 +69,6 @@ PP(pp_wantarray) PP(pp_regcreset) { dVAR; - /* XXXX Should store the old value to allow for tie/overload - and - restore in regcomp, where marked with XXXX. */ - PL_reginterp_cnt = 0; TAINT_NOT; return NORMAL; } @@ -110,9 +107,6 @@ PP(pp_regcomp) assert (re != (REGEXP*) &PL_sv_undef); eng = re ? RX_ENGINE(re) : current_re_engine(); - if (PL_op->op_flags & OPf_SPECIAL) - PL_reginterp_cnt = (I32_MAX>>1); /* Mark as safe. */ - new_re = (eng->op_comp ? eng->op_comp : &Perl_re_op_compile @@ -156,8 +150,6 @@ PP(pp_regcomp) PM_SETRE(pm, new_re); } - PL_reginterp_cnt = 0; /* XXXX Be extra paranoid - needed - inside tie/overload accessors. */ #ifndef INCOMPLETE_TAINTS if (PL_tainting && PL_tainted) { SvTAINTED_on((SV*)new_re); @@ -5476,11 +5476,8 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, } else { - if (SvROK(msv) && SvTYPE(SvRV(msv)) == SVt_REGEXP) { + if (SvROK(msv) && SvTYPE(SvRV(msv)) == SVt_REGEXP) msv = SvRV(msv); - PL_reginterp_cnt += - RX_SEEN_EVALS((REGEXP *)MUTABLE_PTR(msv)); - } sv_catsv_nomg(pat, msv); if (code) pRExC_state->code_blocks[n-1].end = SvCUR(pat)-1; @@ -2839,7 +2839,6 @@ Perl_sv_2pv_flags(pTHX_ register SV *const sv, STRLEN *const lp, const I32 flags || amagic_is_enabled(string_amg) )) { REGEXP * const re = (REGEXP *)MUTABLE_PTR(referent); - I32 seen_evals = 0; assert(re); @@ -2850,9 +2849,6 @@ Perl_sv_2pv_flags(pTHX_ register SV *const sv, STRLEN *const lp, const I32 flags else SvUTF8_off(sv); - if ((seen_evals = RX_SEEN_EVALS(re))) - PL_reginterp_cnt += seen_evals; - if (lp) *lp = RX_WRAPLEN(re); @@ -13025,7 +13021,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, /* RE engine related */ Zero(&PL_reg_state, 1, struct re_save_state); - PL_reginterp_cnt = 0; PL_regmatch_slab = NULL; PL_sub_generation = proto_perl->Isub_generation; |