X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/f1f99dc1f9e949ceafeeaead7b5f43b1aab8224d..3caf0269dd4c609b8c2bc22b54598c642ba63ed8:/scope.c diff --git a/scope.c b/scope.c index cb0e8c5..78a465b 100644 --- a/scope.c +++ b/scope.c @@ -27,18 +27,34 @@ #include "perl.h" SV** -Perl_stack_grow(pTHX_ SV **sp, SV **p, int n) +Perl_stack_grow(pTHX_ SV **sp, SV **p, SSize_t n) { - dVAR; + SSize_t extra; + SSize_t current = (p - PL_stack_base); PERL_ARGS_ASSERT_STACK_GROW; + if (UNLIKELY(n < 0)) + Perl_croak(aTHX_ + "panic: stack_grow() negative count (%"IVdf")", (IV)n); + PL_stack_sp = sp; -#ifndef STRESS_REALLOC - av_extend(PL_curstack, (p - PL_stack_base) + (n) + 128); + extra = +#ifdef STRESS_REALLOC + 1; #else - av_extend(PL_curstack, (p - PL_stack_base) + (n) + 1); + 128; #endif + /* If the total might wrap, panic instead. This is really testing + * that (current + n + extra < SSize_t_MAX), but done in a way that + * can't wrap */ + if (UNLIKELY( current > SSize_t_MAX - extra + || current + extra > SSize_t_MAX - n + )) + /* diag_listed_as: Out of memory during %s extend */ + Perl_croak(aTHX_ "Out of memory during stack extend"); + + av_extend(PL_curstack, current + n + extra); return PL_stack_sp; } @@ -51,7 +67,6 @@ Perl_stack_grow(pTHX_ SV **sp, SV **p, int n) PERL_SI * Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems) { - dVAR; PERL_SI *si; Newx(si, 1, PERL_SI); si->si_stack = newAV(); @@ -65,7 +80,7 @@ Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems) si->si_cxix = -1; si->si_type = PERLSI_UNDEF; Newx(si->si_cxstack, cxitems, PERL_CONTEXT); - /* Without any kind of initialising PUSHSUBST() + /* Without any kind of initialising CX_PUSHSUBST() * in pp_subst() will read uninitialised heap. */ PoisonNew(si->si_cxstack, cxitems, PERL_CONTEXT); return si; @@ -74,7 +89,6 @@ Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems) I32 Perl_cxinc(pTHX) { - dVAR; const IV old_max = cxstack_max; cxstack_max = GROW(cxstack_max); Renew(cxstack, cxstack_max + 1, PERL_CONTEXT); @@ -87,8 +101,7 @@ Perl_cxinc(pTHX) void Perl_push_scope(pTHX) { - dVAR; - if (PL_scopestack_ix == PL_scopestack_max) { + if (UNLIKELY(PL_scopestack_ix == PL_scopestack_max)) { PL_scopestack_max = GROW(PL_scopestack_max); Renew(PL_scopestack, PL_scopestack_max, I32); #ifdef DEBUGGING @@ -105,66 +118,89 @@ Perl_push_scope(pTHX) void Perl_pop_scope(pTHX) { - dVAR; const I32 oldsave = PL_scopestack[--PL_scopestack_ix]; LEAVE_SCOPE(oldsave); } -void +I32 * Perl_markstack_grow(pTHX) { - dVAR; const I32 oldmax = PL_markstack_max - PL_markstack; const I32 newmax = GROW(oldmax); Renew(PL_markstack, newmax, I32); - PL_markstack_ptr = PL_markstack + oldmax; PL_markstack_max = PL_markstack + newmax; + PL_markstack_ptr = PL_markstack + oldmax; + DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, + "MARK grow %p %"IVdf" by %"IVdf"\n", + PL_markstack_ptr, (IV)*PL_markstack_ptr, (IV)oldmax))); + return PL_markstack_ptr; } void Perl_savestack_grow(pTHX) { - dVAR; - PL_savestack_max = GROW(PL_savestack_max) + 4; - Renew(PL_savestack, PL_savestack_max, ANY); + PL_savestack_max = GROW(PL_savestack_max); + /* Note that we allocate SS_MAXPUSH slots higher than ss_max + * so that SS_ADD_END(), SSGROW() etc can do a simper check */ + Renew(PL_savestack, PL_savestack_max + SS_MAXPUSH, ANY); } void Perl_savestack_grow_cnt(pTHX_ I32 need) { - dVAR; PL_savestack_max = PL_savestack_ix + need; - Renew(PL_savestack, PL_savestack_max, ANY); + /* Note that we allocate SS_MAXPUSH slots higher than ss_max + * so that SS_ADD_END(), SSGROW() etc can do a simper check */ + Renew(PL_savestack, PL_savestack_max + SS_MAXPUSH, ANY); } #undef GROW -void -Perl_tmps_grow(pTHX_ I32 n) +/* The original function was called Perl_tmps_grow and was removed from public + API, Perl_tmps_grow_p is the replacement and it used in public macros but + isn't public itself. + + Perl_tmps_grow_p takes a proposed ix. A proposed ix is PL_tmps_ix + extend_by, + where the result of (PL_tmps_ix + extend_by) is >= PL_tmps_max + Upon return, PL_tmps_stack[ix] will be a valid address. For machine code + optimization and register usage reasons, the proposed ix passed into + tmps_grow is returned to the caller which the caller can then use to write + an SV * to PL_tmps_stack[ix]. If the caller was using tmps_grow in + pre-extend mode (EXTEND_MORTAL macro), then it ignores the return value of + tmps_grow. Note, tmps_grow DOES NOT write ix to PL_tmps_ix, the caller + must assign ix or ret val of tmps_grow to PL_temps_ix themselves if that is + appropriate. The assignment to PL_temps_ix can happen before or after + tmps_grow call since tmps_grow doesn't look at PL_tmps_ix. + */ + +SSize_t +Perl_tmps_grow_p(pTHX_ SSize_t ix) { - dVAR; + SSize_t extend_to = ix; #ifndef STRESS_REALLOC - if (n < 128) - n = (PL_tmps_max < 512) ? 128 : 512; + if (ix - PL_tmps_max < 128) + extend_to += (PL_tmps_max < 512) ? 128 : 512; #endif - PL_tmps_max = PL_tmps_ix + n + 1; + PL_tmps_max = extend_to + 1; Renew(PL_tmps_stack, PL_tmps_max, SV*); + return ix; } void Perl_free_tmps(pTHX) { - dVAR; /* XXX should tmps_floor live in cxstack? */ - const I32 myfloor = PL_tmps_floor; + const SSize_t myfloor = PL_tmps_floor; while (PL_tmps_ix > myfloor) { /* clean up after last statement */ - SV* const sv = PL_tmps_stack[PL_tmps_ix]; - PL_tmps_stack[PL_tmps_ix--] = NULL; - if (sv && sv != &PL_sv_undef) { + SV* const sv = PL_tmps_stack[PL_tmps_ix--]; +#ifdef PERL_POISON + PoisonWith(PL_tmps_stack + PL_tmps_ix + 1, 1, SV *, 0xAB); +#endif + if (LIKELY(sv)) { SvTEMP_off(sv); - SvREFCNT_dec(sv); /* note, can modify tmps_ix!!! */ + SvREFCNT_dec_NN(sv); /* note, can modify tmps_ix!!! */ } } } @@ -172,22 +208,18 @@ Perl_free_tmps(pTHX) STATIC SV * S_save_scalar_at(pTHX_ SV **sptr, const U32 flags) { - dVAR; SV * osv; - register SV *sv; + SV *sv; PERL_ARGS_ASSERT_SAVE_SCALAR_AT; osv = *sptr; - sv = (flags & SAVEf_KEEPOLDELEM) ? osv : (*sptr = newSV(0)); - - if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv)) { - if (SvGMAGICAL(osv)) { - SvFLAGS(osv) |= (SvFLAGS(osv) & - (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT; - } - if (!(flags & SAVEf_KEEPOLDELEM)) - mg_localize(osv, sv, cBOOL(flags & SAVEf_SETMAGIC)); + if (flags & SAVEf_KEEPOLDELEM) + sv = osv; + else { + sv = (*sptr = newSV(0)); + if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv)) + mg_localize(osv, sv, cBOOL(flags & SAVEf_SETMAGIC)); } return sv; @@ -196,24 +228,25 @@ S_save_scalar_at(pTHX_ SV **sptr, const U32 flags) void Perl_save_pushptrptr(pTHX_ void *const ptr1, void *const ptr2, const int type) { - dVAR; - SSCHECK(3); - SSPUSHPTR(ptr1); - SSPUSHPTR(ptr2); - SSPUSHUV(type); + dSS_ADD; + SS_ADD_PTR(ptr1); + SS_ADD_PTR(ptr2); + SS_ADD_UV(type); + SS_ADD_END(3); } SV * Perl_save_scalar(pTHX_ GV *gv) { - dVAR; SV ** const sptr = &GvSVn(gv); PERL_ARGS_ASSERT_SAVE_SCALAR; - PL_localizing = 1; - SvGETMAGIC(*sptr); - PL_localizing = 0; + if (UNLIKELY(SvGMAGICAL(*sptr))) { + PL_localizing = 1; + (void)mg_get(*sptr); + PL_localizing = 0; + } save_pushptrptr(SvREFCNT_inc_simple(gv), SvREFCNT_inc(*sptr), SAVEt_SV); return save_scalar_at(sptr, SAVEf_SETMAGIC); /* XXX - FIXME - see #60360 */ } @@ -223,8 +256,6 @@ Perl_save_scalar(pTHX_ GV *gv) void Perl_save_generic_svref(pTHX_ SV **sptr) { - dVAR; - PERL_ARGS_ASSERT_SAVE_GENERIC_SVREF; save_pushptrptr(sptr, SvREFCNT_inc(*sptr), SAVEt_GENERIC_SVREF); @@ -236,8 +267,6 @@ Perl_save_generic_svref(pTHX_ SV **sptr) void Perl_save_generic_pvref(pTHX_ char **str) { - dVAR; - PERL_ARGS_ASSERT_SAVE_GENERIC_PVREF; save_pushptrptr(*str, str, SAVEt_GENERIC_PVREF); @@ -249,8 +278,6 @@ Perl_save_generic_pvref(pTHX_ char **str) void Perl_save_shared_pvref(pTHX_ char **str) { - dVAR; - PERL_ARGS_ASSERT_SAVE_SHARED_PVREF; save_pushptrptr(str, *str, SAVEt_SHARED_PVREF); @@ -261,44 +288,55 @@ Perl_save_shared_pvref(pTHX_ char **str) void Perl_save_set_svflags(pTHX_ SV* sv, U32 mask, U32 val) { - dVAR; + dSS_ADD; PERL_ARGS_ASSERT_SAVE_SET_SVFLAGS; - SSCHECK(4); - SSPUSHPTR(sv); - SSPUSHINT(mask); - SSPUSHINT(val); - SSPUSHUV(SAVEt_SET_SVFLAGS); + SS_ADD_PTR(sv); + SS_ADD_INT(mask); + SS_ADD_INT(val); + SS_ADD_UV(SAVEt_SET_SVFLAGS); + SS_ADD_END(4); } +/* +=for apidoc save_gp + +Saves the current GP of gv on the save stack to be restored on scope exit. + +If empty is true, replace the GP with a new GP. + +If empty is false, mark gv with GVf_INTRO so the next reference +assigned is localized, which is how C< local *foo = $someref; > works. + +=cut +*/ + void Perl_save_gp(pTHX_ GV *gv, I32 empty) { - dVAR; - PERL_ARGS_ASSERT_SAVE_GP; save_pushptrptr(SvREFCNT_inc(gv), GvGP(gv), SAVEt_GP); if (empty) { GP *gp = Perl_newGP(aTHX_ gv); - - if (GvCVu(gv)) - mro_method_changed_in(GvSTASH(gv)); /* taking a method out of circulation ("local")*/ + HV * const stash = GvSTASH(gv); + bool isa_changed = 0; + + if (stash && HvENAME(stash)) { + if (GvNAMELEN(gv) == 3 && strnEQ(GvNAME(gv), "ISA", 3)) + isa_changed = TRUE; + else if (GvCVu(gv)) + /* taking a method out of circulation ("local")*/ + mro_method_changed_in(stash); + } if (GvIOp(gv) && (IoFLAGS(GvIOp(gv)) & IOf_ARGV)) { gp->gp_io = newIO(); IoFLAGS(gp->gp_io) |= IOf_ARGV|IOf_START; } -#ifdef PERL_DONT_CREATE_GVSV - if (gv == PL_errgv) { - /* We could scatter this logic everywhere by changing the - definition of ERRSV from GvSV() to GvSVn(), but it seems more - efficient to do this check once here. */ - gp->gp_sv = newSV(0); - } -#endif GvGP_set(gv,gp); + if (isa_changed) mro_isa_changed_in(stash); } else { gp_ref(GvGP(gv)); @@ -309,19 +347,18 @@ Perl_save_gp(pTHX_ GV *gv, I32 empty) AV * Perl_save_ary(pTHX_ GV *gv) { - dVAR; AV * const oav = GvAVn(gv); AV *av; PERL_ARGS_ASSERT_SAVE_ARY; - if (!AvREAL(oav) && AvREIFY(oav)) + if (UNLIKELY(!AvREAL(oav) && AvREIFY(oav))) av_reify(oav); save_pushptrptr(SvREFCNT_inc_simple_NN(gv), oav, SAVEt_AV); GvAV(gv) = NULL; av = GvAVn(gv); - if (SvMAGIC(oav)) + if (UNLIKELY(SvMAGIC(oav))) mg_localize(MUTABLE_SV(oav), MUTABLE_SV(av), TRUE); return av; } @@ -329,7 +366,6 @@ Perl_save_ary(pTHX_ GV *gv) HV * Perl_save_hash(pTHX_ GV *gv) { - dVAR; HV *ohv, *hv; PERL_ARGS_ASSERT_SAVE_HASH; @@ -340,16 +376,15 @@ Perl_save_hash(pTHX_ GV *gv) GvHV(gv) = NULL; hv = GvHVn(gv); - if (SvMAGIC(ohv)) + if (UNLIKELY(SvMAGIC(ohv))) mg_localize(MUTABLE_SV(ohv), MUTABLE_SV(hv), TRUE); return hv; } void -Perl_save_item(pTHX_ register SV *item) +Perl_save_item(pTHX_ SV *item) { - dVAR; - register SV * const sv = newSVsv(item); + SV * const sv = newSVsv(item); PERL_ARGS_ASSERT_SAVE_ITEM; @@ -361,79 +396,101 @@ Perl_save_item(pTHX_ register SV *item) void Perl_save_bool(pTHX_ bool *boolp) { - dVAR; + dSS_ADD; PERL_ARGS_ASSERT_SAVE_BOOL; - SSCHECK(2); - SSPUSHPTR(boolp); - SSPUSHUV(SAVEt_BOOL | (*boolp << 8)); + SS_ADD_PTR(boolp); + SS_ADD_UV(SAVEt_BOOL | (*boolp << 8)); + SS_ADD_END(2); } void Perl_save_pushi32ptr(pTHX_ const I32 i, void *const ptr, const int type) { - dVAR; - SSCHECK(3); - SSPUSHINT(i); - SSPUSHPTR(ptr); - SSPUSHUV(type); + dSS_ADD; + + SS_ADD_INT(i); + SS_ADD_PTR(ptr); + SS_ADD_UV(type); + SS_ADD_END(3); } void Perl_save_int(pTHX_ int *intp) { - dVAR; - const UV shifted = (UV)*intp << SAVE_TIGHT_SHIFT; + const int i = *intp; + UV type = ((UV)((UV)i << SAVE_TIGHT_SHIFT) | SAVEt_INT_SMALL); + int size = 2; + dSS_ADD; PERL_ARGS_ASSERT_SAVE_INT; - if ((int)(shifted >> SAVE_TIGHT_SHIFT) == *intp) { - SSCHECK(2); - SSPUSHPTR(intp); - SSPUSHUV(SAVEt_INT_SMALL | shifted); - } else - save_pushi32ptr(*intp, intp, SAVEt_INT); + if (UNLIKELY((int)(type >> SAVE_TIGHT_SHIFT) != i)) { + SS_ADD_INT(i); + type = SAVEt_INT; + size++; + } + SS_ADD_PTR(intp); + SS_ADD_UV(type); + SS_ADD_END(size); } void Perl_save_I8(pTHX_ I8 *bytep) { - dVAR; + dSS_ADD; PERL_ARGS_ASSERT_SAVE_I8; - SSCHECK(2); - SSPUSHPTR(bytep); - SSPUSHUV(SAVEt_I8 | ((UV)*bytep << 8)); + SS_ADD_PTR(bytep); + SS_ADD_UV(SAVEt_I8 | ((UV)*bytep << 8)); + SS_ADD_END(2); } void Perl_save_I16(pTHX_ I16 *intp) { - dVAR; + dSS_ADD; PERL_ARGS_ASSERT_SAVE_I16; - SSCHECK(2); - SSPUSHPTR(intp); - SSPUSHUV(SAVEt_I16 | ((UV)*intp << 8)); + SS_ADD_PTR(intp); + SS_ADD_UV(SAVEt_I16 | ((UV)*intp << 8)); + SS_ADD_END(2); } void Perl_save_I32(pTHX_ I32 *intp) { - dVAR; - const UV shifted = (UV)*intp << SAVE_TIGHT_SHIFT; + const I32 i = *intp; + UV type = ((I32)((U32)i << SAVE_TIGHT_SHIFT) | SAVEt_I32_SMALL); + int size = 2; + dSS_ADD; PERL_ARGS_ASSERT_SAVE_I32; - if ((I32)(shifted >> SAVE_TIGHT_SHIFT) == *intp) { - SSCHECK(2); - SSPUSHPTR(intp); - SSPUSHUV(SAVEt_I32_SMALL | shifted); - } else - save_pushi32ptr(*intp, intp, SAVEt_I32); + if (UNLIKELY((I32)(type >> SAVE_TIGHT_SHIFT) != i)) { + SS_ADD_INT(i); + type = SAVEt_I32; + size++; + } + SS_ADD_PTR(intp); + SS_ADD_UV(type); + SS_ADD_END(size); +} + +void +Perl_save_strlen(pTHX_ STRLEN *ptr) +{ + dSS_ADD; + + PERL_ARGS_ASSERT_SAVE_STRLEN; + + SS_ADD_IV(*ptr); + SS_ADD_PTR(ptr); + SS_ADD_UV(SAVEt_STRLEN); + SS_ADD_END(3); } /* Cannot use save_sptr() to store a char* since the SV** cast will @@ -442,8 +499,6 @@ Perl_save_I32(pTHX_ I32 *intp) void Perl_save_pptr(pTHX_ char **pptr) { - dVAR; - PERL_ARGS_ASSERT_SAVE_PPTR; save_pushptrptr(*pptr, pptr, SAVEt_PPTR); @@ -452,8 +507,6 @@ Perl_save_pptr(pTHX_ char **pptr) void Perl_save_vptr(pTHX_ void *ptr) { - dVAR; - PERL_ARGS_ASSERT_SAVE_VPTR; save_pushptrptr(*(char**)ptr, ptr, SAVEt_VPTR); @@ -462,8 +515,6 @@ Perl_save_vptr(pTHX_ void *ptr) void Perl_save_sptr(pTHX_ SV **sptr) { - dVAR; - PERL_ARGS_ASSERT_SAVE_SPTR; save_pushptrptr(*sptr, sptr, SAVEt_SPTR); @@ -472,20 +523,19 @@ Perl_save_sptr(pTHX_ SV **sptr) void Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off) { - dVAR; - SSCHECK(4); + dSS_ADD; + ASSERT_CURPAD_ACTIVE("save_padsv"); - SSPUSHPTR(SvREFCNT_inc_simple_NN(PL_curpad[off])); - SSPUSHPTR(PL_comppad); - SSPUSHLONG((long)off); - SSPUSHUV(SAVEt_PADSV_AND_MORTALIZE); + SS_ADD_PTR(SvREFCNT_inc_simple_NN(PL_curpad[off])); + SS_ADD_PTR(PL_comppad); + SS_ADD_UV((UV)off); + SS_ADD_UV(SAVEt_PADSV_AND_MORTALIZE); + SS_ADD_END(4); } void Perl_save_hptr(pTHX_ HV **hptr) { - dVAR; - PERL_ARGS_ASSERT_SAVE_HPTR; save_pushptrptr(*hptr, hptr, SAVEt_HPTR); @@ -494,8 +544,6 @@ Perl_save_hptr(pTHX_ HV **hptr) void Perl_save_aptr(pTHX_ AV **aptr) { - dVAR; - PERL_ARGS_ASSERT_SAVE_APTR; save_pushptrptr(*aptr, aptr, SAVEt_APTR); @@ -504,36 +552,37 @@ Perl_save_aptr(pTHX_ AV **aptr) void Perl_save_pushptr(pTHX_ void *const ptr, const int type) { - dVAR; - SSCHECK(2); - SSPUSHPTR(ptr); - SSPUSHUV(type); + dSS_ADD; + SS_ADD_PTR(ptr); + SS_ADD_UV(type); + SS_ADD_END(2); } void Perl_save_clearsv(pTHX_ SV **svp) { - dVAR; const UV offset = svp - PL_curpad; const UV offset_shifted = offset << SAVE_TIGHT_SHIFT; PERL_ARGS_ASSERT_SAVE_CLEARSV; ASSERT_CURPAD_ACTIVE("save_clearsv"); - if ((offset_shifted >> SAVE_TIGHT_SHIFT) != offset) + SvPADSTALE_off(*svp); /* mark lexical as active */ + if (UNLIKELY((offset_shifted >> SAVE_TIGHT_SHIFT) != offset)) { Perl_croak(aTHX_ "panic: pad offset %"UVuf" out of range (%p-%p)", offset, svp, PL_curpad); + } - SSCHECK(1); - SSPUSHUV(offset_shifted | SAVEt_CLEARSV); - SvPADSTALE_off(*svp); /* mark lexical as active */ + { + dSS_ADD; + SS_ADD_UV(offset_shifted | SAVEt_CLEARSV); + SS_ADD_END(1); + } } void Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen) { - dVAR; - PERL_ARGS_ASSERT_SAVE_DELETE; save_pushptri32ptr(key, klen, SvREFCNT_inc_simple(hv), SAVEt_DELETE); @@ -555,47 +604,51 @@ Perl_save_hdelete(pTHX_ HV *hv, SV *keysv) } void -Perl_save_adelete(pTHX_ AV *av, I32 key) +Perl_save_adelete(pTHX_ AV *av, SSize_t key) { - dVAR; + dSS_ADD; PERL_ARGS_ASSERT_SAVE_ADELETE; SvREFCNT_inc_void(av); - save_pushi32ptr(key, av, SAVEt_ADELETE); + SS_ADD_UV(key); + SS_ADD_PTR(av); + SS_ADD_IV(SAVEt_ADELETE); + SS_ADD_END(3); } void Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p) { - dVAR; - + dSS_ADD; PERL_ARGS_ASSERT_SAVE_DESTRUCTOR; - SSCHECK(3); - SSPUSHDPTR(f); - SSPUSHPTR(p); - SSPUSHUV(SAVEt_DESTRUCTOR); + SS_ADD_DPTR(f); + SS_ADD_PTR(p); + SS_ADD_UV(SAVEt_DESTRUCTOR); + SS_ADD_END(3); } void Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p) { - dVAR; - SSCHECK(3); - SSPUSHDXPTR(f); - SSPUSHPTR(p); - SSPUSHUV(SAVEt_DESTRUCTOR_X); + dSS_ADD; + + SS_ADD_DXPTR(f); + SS_ADD_PTR(p); + SS_ADD_UV(SAVEt_DESTRUCTOR_X); + SS_ADD_END(3); } void Perl_save_hints(pTHX) { - dVAR; COPHH *save_cophh = cophh_copy(CopHINTHASH_get(&PL_compiling)); if (PL_hints & HINT_LOCALIZE_HH) { - save_pushptri32ptr(GvHV(PL_hintgv), PL_hints, save_cophh, SAVEt_HINTS); - GvHV(PL_hintgv) = hv_copy_hints_hv(GvHV(PL_hintgv)); + HV *oldhh = GvHV(PL_hintgv); + save_pushptri32ptr(oldhh, PL_hints, save_cophh, SAVEt_HINTS); + GvHV(PL_hintgv) = NULL; /* in case copying dies */ + GvHV(PL_hintgv) = hv_copy_hints_hv(oldhh); } else { save_pushi32ptr(PL_hints, save_cophh, SAVEt_HINTS); } @@ -605,27 +658,33 @@ static void S_save_pushptri32ptr(pTHX_ void *const ptr1, const I32 i, void *const ptr2, const int type) { - SSCHECK(4); - SSPUSHPTR(ptr1); - SSPUSHINT(i); - SSPUSHPTR(ptr2); - SSPUSHUV(type); + dSS_ADD; + SS_ADD_PTR(ptr1); + SS_ADD_INT(i); + SS_ADD_PTR(ptr2); + SS_ADD_UV(type); + SS_ADD_END(4); } void -Perl_save_aelem_flags(pTHX_ AV *av, I32 idx, SV **sptr, const U32 flags) +Perl_save_aelem_flags(pTHX_ AV *av, SSize_t idx, SV **sptr, + const U32 flags) { - dVAR; + dSS_ADD; SV *sv; PERL_ARGS_ASSERT_SAVE_AELEM_FLAGS; SvGETMAGIC(*sptr); - save_pushptri32ptr(SvREFCNT_inc_simple(av), idx, SvREFCNT_inc(*sptr), - SAVEt_AELEM); - /* if it gets reified later, the restore will have the wrong refcnt */ - if (!AvREAL(av) && AvREIFY(av)) - SvREFCNT_inc_void(*sptr); + SS_ADD_PTR(SvREFCNT_inc_simple(av)); + SS_ADD_IV(idx); + SS_ADD_PTR(SvREFCNT_inc(*sptr)); + SS_ADD_UV(SAVEt_AELEM); + SS_ADD_END(4); + /* The array needs to hold a reference count on its new element, so it + must be AvREAL. */ + if (UNLIKELY(!AvREAL(av) && AvREIFY(av))) + av_reify(av); save_scalar_at(sptr, flags); /* XXX - FIXME - see #60360 */ if (flags & SAVEf_KEEPOLDELEM) return; @@ -634,24 +693,26 @@ Perl_save_aelem_flags(pTHX_ AV *av, I32 idx, SV **sptr, const U32 flags) * won't actually be stored in the array - so it won't get * reaped when the localize ends. Ensure it gets reaped by * mortifying it instead. DAPM */ - if (SvTIED_mg((const SV *)av, PERL_MAGIC_tied)) + if (UNLIKELY(SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) sv_2mortal(sv); } void Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags) { - dVAR; SV *sv; PERL_ARGS_ASSERT_SAVE_HELEM_FLAGS; SvGETMAGIC(*sptr); - SSCHECK(4); - SSPUSHPTR(SvREFCNT_inc_simple(hv)); - SSPUSHPTR(newSVsv(key)); - SSPUSHPTR(SvREFCNT_inc(*sptr)); - SSPUSHUV(SAVEt_HELEM); + { + dSS_ADD; + SS_ADD_PTR(SvREFCNT_inc_simple(hv)); + SS_ADD_PTR(newSVsv(key)); + SS_ADD_PTR(SvREFCNT_inc(*sptr)); + SS_ADD_UV(SAVEt_HELEM); + SS_ADD_END(4); + } save_scalar_at(sptr, flags); if (flags & SAVEf_KEEPOLDELEM) return; @@ -660,15 +721,13 @@ Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags) * won't actually be stored in the hash - so it won't get * reaped when the localize ends. Ensure it gets reaped by * mortifying it instead. DAPM */ - if (SvTIED_mg((const SV *)hv, PERL_MAGIC_tied)) + if (UNLIKELY(SvTIED_mg((const SV *)hv, PERL_MAGIC_tied))) sv_2mortal(sv); } SV* Perl_save_svref(pTHX_ SV **sptr) { - dVAR; - PERL_ARGS_ASSERT_SAVE_SVREF; SvGETMAGIC(*sptr); @@ -676,18 +735,30 @@ Perl_save_svref(pTHX_ SV **sptr) return save_scalar_at(sptr, SAVEf_SETMAGIC); /* XXX - FIXME - see #60360 */ } + +void +Perl_savetmps(pTHX) +{ + dSS_ADD; + SS_ADD_IV(PL_tmps_floor); + PL_tmps_floor = PL_tmps_ix; + SS_ADD_UV(SAVEt_TMPSFLOOR); + SS_ADD_END(2); +} + + I32 Perl_save_alloc(pTHX_ I32 size, I32 pad) { - dVAR; - register const I32 start = pad + ((char*)&PL_savestack[PL_savestack_ix] - - (char*)PL_savestack); + const I32 start = pad + ((char*)&PL_savestack[PL_savestack_ix] + - (char*)PL_savestack); const UV elems = 1 + ((size + pad - 1) / sizeof(*PL_savestack)); const UV elems_shifted = elems << SAVE_TIGHT_SHIFT; - if ((elems_shifted >> SAVE_TIGHT_SHIFT) != elems) - Perl_croak(aTHX_ "panic: save_alloc elems %"UVuf" out of range (%ld-%ld)", - elems, size, pad); + if (UNLIKELY((elems_shifted >> SAVE_TIGHT_SHIFT) != elems)) + Perl_croak(aTHX_ + "panic: save_alloc elems %"UVuf" out of range (%"IVdf"-%"IVdf")", + elems, (IV)size, (IV)pad); SSGROW(elems + 1); @@ -696,267 +767,409 @@ Perl_save_alloc(pTHX_ I32 size, I32 pad) return start; } + + +#define ARG0_SV MUTABLE_SV(arg0.any_ptr) +#define ARG0_AV MUTABLE_AV(arg0.any_ptr) +#define ARG0_HV MUTABLE_HV(arg0.any_ptr) +#define ARG0_PTR arg0.any_ptr +#define ARG0_PV (char*)(arg0.any_ptr) +#define ARG0_PVP (char**)(arg0.any_ptr) +#define ARG0_I32 (arg0.any_i32) + +#define ARG1_SV MUTABLE_SV(arg1.any_ptr) +#define ARG1_AV MUTABLE_AV(arg1.any_ptr) +#define ARG1_GV MUTABLE_GV(arg1.any_ptr) +#define ARG1_SVP (SV**)(arg1.any_ptr) +#define ARG1_PVP (char**)(arg1.any_ptr) +#define ARG1_PTR arg1.any_ptr +#define ARG1_PV (char*)(arg1.any_ptr) +#define ARG1_I32 (arg1.any_i32) + +#define ARG2_SV MUTABLE_SV(arg2.any_ptr) +#define ARG2_AV MUTABLE_AV(arg2.any_ptr) +#define ARG2_HV MUTABLE_HV(arg2.any_ptr) +#define ARG2_GV MUTABLE_GV(arg2.any_ptr) +#define ARG2_PV (char*)(arg2.any_ptr) + void Perl_leave_scope(pTHX_ I32 base) { - dVAR; - register SV *sv; - register SV *value; - register GV *gv; - register AV *av; - register HV *hv; - void* ptr; - register char* str; - I32 i; /* Localise the effects of the TAINT_NOT inside the loop. */ - const bool was = PL_tainted; + bool was = TAINT_get; + + I32 i; + SV *sv; + + ANY arg0, arg1, arg2; - if (base < -1) - Perl_croak(aTHX_ "panic: corrupt saved stack index"); + /* these initialisations are logically unnecessary, but they shut up + * spurious 'may be used uninitialized' compiler warnings */ + arg0.any_ptr = NULL; + arg1.any_ptr = NULL; + arg2.any_ptr = NULL; + + if (UNLIKELY(base < -1)) + Perl_croak(aTHX_ "panic: corrupt saved stack index %ld", (long) base); DEBUG_l(Perl_deb(aTHX_ "savestack: releasing items %ld -> %ld\n", (long)PL_savestack_ix, (long)base)); while (PL_savestack_ix > base) { - UV uv = SSPOPUV; - const U8 type = (U8)uv & SAVE_MASK; + UV uv; + U8 type; + + SV *refsv; + SV **svp; + TAINT_NOT; + { + I32 ix = PL_savestack_ix - 1; + ANY *p = &PL_savestack[ix]; + uv = p->any_uv; + type = (U8)uv & SAVE_MASK; + if (type > SAVEt_ARG0_MAX) { + ANY *p0 = p; + arg0 = *--p; + if (type > SAVEt_ARG1_MAX) { + arg1 = *--p; + if (type > SAVEt_ARG2_MAX) { + arg2 = *--p; + } + } + ix -= (p0 - p); + } + PL_savestack_ix = ix; + } + switch (type) { case SAVEt_ITEM: /* normal string */ - value = MUTABLE_SV(SSPOPPTR); - sv = MUTABLE_SV(SSPOPPTR); - sv_replace(sv,value); - PL_localizing = 2; - SvSETMAGIC(sv); - PL_localizing = 0; + sv_replace(ARG1_SV, ARG0_SV); + if (UNLIKELY(SvSMAGICAL(ARG1_SV))) { + PL_localizing = 2; + mg_set(ARG1_SV); + PL_localizing = 0; + } break; + + /* This would be a mathom, but Perl_save_svref() calls a static + function, S_save_scalar_at(), so has to stay in this file. */ + case SAVEt_SVREF: /* scalar reference */ + svp = ARG1_SVP; + refsv = NULL; /* what to refcnt_dec */ + goto restore_sv; + case SAVEt_SV: /* scalar reference */ - value = MUTABLE_SV(SSPOPPTR); - gv = MUTABLE_GV(SSPOPPTR); - ptr = &GvSV(gv); - av = MUTABLE_AV(gv); /* what to refcnt_dec */ + svp = &GvSV(ARG1_GV); + refsv = ARG1_SV; /* what to refcnt_dec */ restore_sv: - sv = *(SV**)ptr; - *(SV**)ptr = value; + { + SV * const sv = *svp; + *svp = ARG0_SV; SvREFCNT_dec(sv); - PL_localizing = 2; - SvSETMAGIC(value); - PL_localizing = 0; - SvREFCNT_dec(value); - SvREFCNT_dec(av); /* av may actually be an AV, HV or GV */ + if (UNLIKELY(SvSMAGICAL(ARG0_SV))) { + /* mg_set could die, skipping the freeing of ARG0_SV and + * refsv; Ensure that they're always freed in that case */ + dSS_ADD; + SS_ADD_PTR(ARG0_SV); + SS_ADD_UV(SAVEt_FREESV); + SS_ADD_PTR(refsv); + SS_ADD_UV(SAVEt_FREESV); + SS_ADD_END(4); + PL_localizing = 2; + mg_set(ARG0_SV); + PL_localizing = 0; + break; + } + SvREFCNT_dec_NN(ARG0_SV); + SvREFCNT_dec(refsv); break; + } case SAVEt_GENERIC_PVREF: /* generic pv */ - ptr = SSPOPPTR; - str = (char*)SSPOPPTR; - if (*(char**)ptr != str) { - Safefree(*(char**)ptr); - *(char**)ptr = str; + if (*ARG0_PVP != ARG1_PV) { + Safefree(*ARG0_PVP); + *ARG0_PVP = ARG1_PV; } break; case SAVEt_SHARED_PVREF: /* shared pv */ - str = (char*)SSPOPPTR; - ptr = SSPOPPTR; - if (*(char**)ptr != str) { + if (*ARG1_PVP != ARG0_PV) { #ifdef NETWARE - PerlMem_free(*(char**)ptr); + PerlMem_free(*ARG1_PVP); #else - PerlMemShared_free(*(char**)ptr); + PerlMemShared_free(*ARG1_PVP); #endif - *(char**)ptr = str; + *ARG1_PVP = ARG0_PV; } break; case SAVEt_GVSV: /* scalar slot in GV */ - value = MUTABLE_SV(SSPOPPTR); - gv = MUTABLE_GV(SSPOPPTR); - ptr = &GvSV(gv); + svp = &GvSV(ARG1_GV); goto restore_svp; case SAVEt_GENERIC_SVREF: /* generic sv */ - value = MUTABLE_SV(SSPOPPTR); - ptr = SSPOPPTR; + svp = ARG1_SVP; restore_svp: - sv = *(SV**)ptr; - *(SV**)ptr = value; + { + SV * const sv = *svp; + *svp = ARG0_SV; SvREFCNT_dec(sv); - SvREFCNT_dec(value); + SvREFCNT_dec(ARG0_SV); break; - case SAVEt_AV: /* array reference */ - av = MUTABLE_AV(SSPOPPTR); - gv = MUTABLE_GV(SSPOPPTR); - SvREFCNT_dec(GvAV(gv)); - GvAV(gv) = av; - if (SvMAGICAL(av)) { - PL_localizing = 2; - SvSETMAGIC(MUTABLE_SV(av)); - PL_localizing = 0; + } + case SAVEt_GVSLOT: /* any slot in GV */ + { + HV *const hv = GvSTASH(ARG2_GV); + svp = ARG1_SVP; + if (hv && HvENAME(hv) && ( + (ARG0_SV && SvTYPE(ARG0_SV) == SVt_PVCV) + || (*svp && SvTYPE(*svp) == SVt_PVCV) + )) + { + if ((char *)svp < (char *)GvGP(ARG2_GV) + || (char *)svp > (char *)GvGP(ARG2_GV) + sizeof(struct gp) + || GvREFCNT(ARG2_GV) > 2) /* "> 2" to ignore savestack's ref */ + PL_sub_generation++; + else mro_method_changed_in(hv); } - SvREFCNT_dec(gv); + goto restore_svp; + } + case SAVEt_AV: /* array reference */ + SvREFCNT_dec(GvAV(ARG1_GV)); + GvAV(ARG1_GV) = ARG0_AV; + avhv_common: + if (UNLIKELY(SvSMAGICAL(ARG0_SV))) { + /* mg_set might die, so make sure ARG1 isn't leaked */ + dSS_ADD; + SS_ADD_PTR(ARG1_SV); + SS_ADD_UV(SAVEt_FREESV); + SS_ADD_END(2); + PL_localizing = 2; + mg_set(ARG0_SV); + PL_localizing = 0; + break; + } + SvREFCNT_dec_NN(ARG1_GV); break; case SAVEt_HV: /* hash reference */ - hv = MUTABLE_HV(SSPOPPTR); - gv = MUTABLE_GV(SSPOPPTR); - SvREFCNT_dec(GvHV(gv)); - GvHV(gv) = hv; - if (SvMAGICAL(hv)) { - PL_localizing = 2; - SvSETMAGIC(MUTABLE_SV(hv)); - PL_localizing = 0; - } - SvREFCNT_dec(gv); - break; + SvREFCNT_dec(GvHV(ARG1_GV)); + GvHV(ARG1_GV) = ARG0_HV; + goto avhv_common; + case SAVEt_INT_SMALL: - ptr = SSPOPPTR; - *(int*)ptr = (int)(uv >> SAVE_TIGHT_SHIFT); + *(int*)ARG0_PTR = (int)(uv >> SAVE_TIGHT_SHIFT); break; case SAVEt_INT: /* int reference */ - ptr = SSPOPPTR; - *(int*)ptr = (int)SSPOPINT; + *(int*)ARG0_PTR = (int)ARG1_I32; + break; + case SAVEt_STRLEN: /* STRLEN/size_t ref */ + *(STRLEN*)ARG0_PTR = (STRLEN)arg1.any_iv; + break; + case SAVEt_TMPSFLOOR: /* restore PL_tmps_floor */ + PL_tmps_floor = (SSize_t)arg0.any_iv; break; case SAVEt_BOOL: /* bool reference */ - ptr = SSPOPPTR; - *(bool*)ptr = cBOOL(uv >> 8); + *(bool*)ARG0_PTR = cBOOL(uv >> 8); +#ifdef NO_TAINT_SUPPORT + PERL_UNUSED_VAR(was); +#else + if (UNLIKELY(ARG0_PTR == &(TAINT_get))) { + /* If we don't update , to reflect what was saved on the + * stack for PL_tainted, then we will overwrite this attempt to + * restore it when we exit this routine. Note that this won't + * work if this value was saved in a wider-than necessary type, + * such as I32 */ + was = *(bool*)ARG0_PTR; + } +#endif break; case SAVEt_I32_SMALL: - ptr = SSPOPPTR; - *(I32*)ptr = (I32)(uv >> SAVE_TIGHT_SHIFT); + *(I32*)ARG0_PTR = (I32)(uv >> SAVE_TIGHT_SHIFT); break; case SAVEt_I32: /* I32 reference */ - ptr = SSPOPPTR; #ifdef PERL_DEBUG_READONLY_OPS - { - const I32 val = SSPOPINT; - if (*(I32*)ptr != val) - *(I32*)ptr = val; - } -#else - *(I32*)ptr = (I32)SSPOPINT; + if (*(I32*)ARG0_PTR != ARG1_I32) #endif + *(I32*)ARG0_PTR = ARG1_I32; break; case SAVEt_SPTR: /* SV* reference */ - ptr = SSPOPPTR; - *(SV**)ptr = MUTABLE_SV(SSPOPPTR); + *(SV**)(ARG0_PTR)= ARG1_SV; break; case SAVEt_VPTR: /* random* reference */ case SAVEt_PPTR: /* char* reference */ - ptr = SSPOPPTR; - *(char**)ptr = (char*)SSPOPPTR; + *ARG0_PVP = ARG1_PV; break; case SAVEt_HPTR: /* HV* reference */ - ptr = SSPOPPTR; - *(HV**)ptr = MUTABLE_HV(SSPOPPTR); + *(HV**)ARG0_PTR = MUTABLE_HV(ARG1_PTR); break; case SAVEt_APTR: /* AV* reference */ - ptr = SSPOPPTR; - *(AV**)ptr = MUTABLE_AV(SSPOPPTR); + *(AV**)ARG0_PTR = ARG1_AV; break; case SAVEt_GP: /* scalar reference */ - ptr = SSPOPPTR; - gv = MUTABLE_GV(SSPOPPTR); - gp_free(gv); - GvGP_set(gv, (GP*)ptr); - /* putting a method back into circulation ("local")*/ - if (GvCVu(gv) && (hv=GvSTASH(gv)) && HvENAME_get(hv)) - mro_method_changed_in(hv); - SvREFCNT_dec(gv); + { + HV *hv; + /* possibly taking a method out of circulation */ + const bool had_method = !!GvCVu(ARG1_GV); + gp_free(ARG1_GV); + GvGP_set(ARG1_GV, (GP*)ARG0_PTR); + if ((hv=GvSTASH(ARG1_GV)) && HvENAME_get(hv)) { + if ( GvNAMELEN(ARG1_GV) == 3 + && strnEQ(GvNAME(ARG1_GV), "ISA", 3) + ) + mro_isa_changed_in(hv); + else if (had_method || GvCVu(ARG1_GV)) + /* putting a method back into circulation ("local")*/ + gv_method_changed(ARG1_GV); + } + SvREFCNT_dec_NN(ARG1_GV); break; + } case SAVEt_FREESV: - ptr = SSPOPPTR; - SvREFCNT_dec(MUTABLE_SV(ptr)); + SvREFCNT_dec(ARG0_SV); + break; + case SAVEt_FREEPADNAME: + PadnameREFCNT_dec((PADNAME *)ARG0_PTR); break; case SAVEt_FREECOPHH: - ptr = SSPOPPTR; - cophh_free((COPHH *)ptr); + cophh_free((COPHH *)ARG0_PTR); break; case SAVEt_MORTALIZESV: - ptr = SSPOPPTR; - sv_2mortal(MUTABLE_SV(ptr)); + sv_2mortal(ARG0_SV); break; case SAVEt_FREEOP: - ptr = SSPOPPTR; - ASSERT_CURPAD_LEGAL("SAVEt_FREEOP"); /* XXX DAPM tmp */ - op_free((OP*)ptr); + ASSERT_CURPAD_LEGAL("SAVEt_FREEOP"); + op_free((OP*)ARG0_PTR); break; case SAVEt_FREEPV: - ptr = SSPOPPTR; - Safefree(ptr); + Safefree(ARG0_PTR); break; + + case SAVEt_CLEARPADRANGE: + i = (I32)((uv >> SAVE_TIGHT_SHIFT) & OPpPADRANGE_COUNTMASK); + svp = &PL_curpad[uv >> + (OPpPADRANGE_COUNTSHIFT + SAVE_TIGHT_SHIFT)] + i - 1; + goto clearsv; case SAVEt_CLEARSV: - ptr = (void*)&PL_curpad[uv >> SAVE_TIGHT_SHIFT]; - sv = *(SV**)ptr; - - DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] clearsv: %ld sv=0x%"UVxf"<%"IVdf"> %s\n", - PTR2UV(PL_comppad), PTR2UV(PL_curpad), - (long)((SV **)ptr-PL_curpad), PTR2UV(sv), (IV)SvREFCNT(sv), - (SvREFCNT(sv) <= 1 && !SvOBJECT(sv)) ? "clear" : "abandon" - )); - - /* Can clear pad variable in place? */ - if (SvREFCNT(sv) <= 1 && !SvOBJECT(sv)) { - /* - * if a my variable that was made readonly is going out of - * scope, we want to remove the readonlyness so that it can - * go out of scope quietly - */ - if (SvPADMY(sv) && !SvFAKE(sv)) - SvREADONLY_off(sv); - - if (SvTHINKFIRST(sv)) - sv_force_normal_flags(sv, SV_IMMEDIATE_UNREF); - if (SvTYPE(sv) == SVt_PVHV) - Perl_hv_kill_backrefs(aTHX_ MUTABLE_HV(sv)); - if (SvMAGICAL(sv)) - sv_unmagic(sv, PERL_MAGIC_backref), - mg_free(sv); - - switch (SvTYPE(sv)) { - case SVt_NULL: - break; - case SVt_PVAV: - av_clear(MUTABLE_AV(sv)); - break; - case SVt_PVHV: - hv_clear(MUTABLE_HV(sv)); - break; - case SVt_PVCV: - Perl_croak(aTHX_ "panic: leave_scope pad code"); - default: - SvOK_off(sv); - break; - } - SvPADSTALE_on(sv); /* mark as no longer live */ - } - else { /* Someone has a claim on this, so abandon it. */ - assert( SvFLAGS(sv) & SVs_PADMY); - assert(!(SvFLAGS(sv) & SVs_PADTMP)); - switch (SvTYPE(sv)) { /* Console ourselves with a new value */ - case SVt_PVAV: *(SV**)ptr = MUTABLE_SV(newAV()); break; - case SVt_PVHV: *(SV**)ptr = MUTABLE_SV(newHV()); break; - default: *(SV**)ptr = newSV(0); break; - } - SvREFCNT_dec(sv); /* Cast current value to the winds. */ - /* preserve pad nature, but also mark as not live - * for any closure capturing */ - SvFLAGS(*(SV**)ptr) |= (SVs_PADMY|SVs_PADSTALE); - } + svp = &PL_curpad[uv >> SAVE_TIGHT_SHIFT]; + i = 1; + clearsv: + for (; i; i--, svp--) { + sv = *svp; + + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad 0x%"UVxf"[0x%"UVxf"] clearsv: %ld sv=0x%"UVxf"<%"IVdf"> %s\n", + PTR2UV(PL_comppad), PTR2UV(PL_curpad), + (long)(svp-PL_curpad), PTR2UV(sv), (IV)SvREFCNT(sv), + (SvREFCNT(sv) <= 1 && !SvOBJECT(sv)) ? "clear" : "abandon" + )); + + /* Can clear pad variable in place? */ + if (SvREFCNT(sv) == 1 && !SvOBJECT(sv)) { + + /* these flags are the union of all the relevant flags + * in the individual conditions within */ + if (UNLIKELY(SvFLAGS(sv) & ( + SVf_READONLY|SVf_PROTECT /*for SvREADONLY_off*/ + | (SVs_GMG|SVs_SMG|SVs_RMG) /* SvMAGICAL() */ + | SVf_OOK + | SVf_THINKFIRST))) + { + /* if a my variable that was made readonly is + * going out of scope, we want to remove the + * readonlyness so that it can go out of scope + * quietly + */ + if (SvREADONLY(sv)) + SvREADONLY_off(sv); + + if (SvOOK(sv)) { /* OOK or HvAUX */ + if (SvTYPE(sv) == SVt_PVHV) + Perl_hv_kill_backrefs(aTHX_ MUTABLE_HV(sv)); + else + sv_backoff(sv); + } + + if (SvMAGICAL(sv)) { + /* note that backrefs (either in HvAUX or magic) + * must be removed before other magic */ + sv_unmagic(sv, PERL_MAGIC_backref); + if (SvTYPE(sv) != SVt_PVCV) + mg_free(sv); + } + if (SvTHINKFIRST(sv)) + sv_force_normal_flags(sv, SV_IMMEDIATE_UNREF + |SV_COW_DROP_PV); + + } + switch (SvTYPE(sv)) { + case SVt_NULL: + break; + case SVt_PVAV: + av_clear(MUTABLE_AV(sv)); + break; + case SVt_PVHV: + hv_clear(MUTABLE_HV(sv)); + break; + case SVt_PVCV: + { + HEK *hek = + CvNAMED(sv) + ? CvNAME_HEK((CV *)sv) + : GvNAME_HEK(CvGV(sv)); + assert(hek); + (void)share_hek_hek(hek); + cv_undef((CV *)sv); + CvNAME_HEK_set(sv, hek); + CvLEXICAL_on(sv); + break; + } + default: + /* This looks odd, but these two macros are for use in + expressions and finish with a trailing comma, so + adding a ; after them would be wrong. */ + assert_not_ROK(sv) + assert_not_glob(sv) + SvFLAGS(sv) &=~ (SVf_OK|SVf_IVisUV|SVf_UTF8); + break; + } + SvPADTMP_off(sv); + SvPADSTALE_on(sv); /* mark as no longer live */ + } + else { /* Someone has a claim on this, so abandon it. */ + switch (SvTYPE(sv)) { /* Console ourselves with a new value */ + case SVt_PVAV: *svp = MUTABLE_SV(newAV()); break; + case SVt_PVHV: *svp = MUTABLE_SV(newHV()); break; + case SVt_PVCV: + { + HEK * const hek = CvNAMED(sv) + ? CvNAME_HEK((CV *)sv) + : GvNAME_HEK(CvGV(sv)); + + /* Create a stub */ + *svp = newSV_type(SVt_PVCV); + + /* Share name */ + CvNAME_HEK_set(*svp, + share_hek_hek(hek)); + CvLEXICAL_on(*svp); + break; + } + default: *svp = newSV(0); break; + } + SvREFCNT_dec_NN(sv); /* Cast current value to the winds. */ + /* preserve pad nature, but also mark as not live + * for any closure capturing */ + SvFLAGS(*svp) |= SVs_PADSTALE; + } + } break; case SAVEt_DELETE: - ptr = SSPOPPTR; - hv = MUTABLE_HV(ptr); - i = SSPOPINT; - ptr = SSPOPPTR; - (void)hv_delete(hv, (char*)ptr, i, G_DISCARD); - SvREFCNT_dec(hv); - Safefree(ptr); + (void)hv_delete(ARG0_HV, ARG2_PV, ARG1_I32, G_DISCARD); + SvREFCNT_dec(ARG0_HV); + Safefree(arg2.any_ptr); break; case SAVEt_ADELETE: - ptr = SSPOPPTR; - av = MUTABLE_AV(ptr); - i = SSPOPINT; - (void)av_delete(av, i, G_DISCARD); - SvREFCNT_dec(av); + (void)av_delete(ARG0_AV, arg1.any_iv, G_DISCARD); + SvREFCNT_dec(ARG0_AV); break; case SAVEt_DESTRUCTOR_X: - ptr = SSPOPPTR; - (*SSPOPDXPTR)(aTHX_ ptr); + (*arg1.any_dxptr)(aTHX_ ARG0_PTR); break; case SAVEt_REGCONTEXT: /* regexp must have croaked */ @@ -964,81 +1177,63 @@ Perl_leave_scope(pTHX_ I32 base) PL_savestack_ix -= uv >> SAVE_TIGHT_SHIFT; break; case SAVEt_STACK_POS: /* Position on Perl stack */ - i = SSPOPINT; - PL_stack_sp = PL_stack_base + i; - break; - case SAVEt_STACK_CXPOS: /* blk_oldsp on context stack */ - i = SSPOPINT; - cxstack[i].blk_oldsp = SSPOPINT; + PL_stack_sp = PL_stack_base + arg0.any_i32; break; case SAVEt_AELEM: /* array element */ - value = MUTABLE_SV(SSPOPPTR); - i = SSPOPINT; - av = MUTABLE_AV(SSPOPPTR); - ptr = av_fetch(av,i,1); - if (!AvREAL(av) && AvREIFY(av)) /* undo reify guard */ - SvREFCNT_dec(value); - if (ptr) { - sv = *(SV**)ptr; - if (sv && sv != &PL_sv_undef) { - if (SvTIED_mg((const SV *)av, PERL_MAGIC_tied)) + svp = av_fetch(ARG2_AV, arg1.any_iv, 1); + if (UNLIKELY(!AvREAL(ARG2_AV) && AvREIFY(ARG2_AV))) /* undo reify guard */ + SvREFCNT_dec(ARG0_SV); + if (LIKELY(svp)) { + SV * const sv = *svp; + if (LIKELY(sv && sv != &PL_sv_undef)) { + if (UNLIKELY(SvTIED_mg((const SV *)ARG2_AV, PERL_MAGIC_tied))) SvREFCNT_inc_void_NN(sv); + refsv = ARG2_SV; goto restore_sv; } } - SvREFCNT_dec(av); - SvREFCNT_dec(value); + SvREFCNT_dec(ARG2_AV); + SvREFCNT_dec(ARG0_SV); break; case SAVEt_HELEM: /* hash element */ - value = MUTABLE_SV(SSPOPPTR); - sv = MUTABLE_SV(SSPOPPTR); - hv = MUTABLE_HV(SSPOPPTR); - ptr = hv_fetch_ent(hv, sv, 1, 0); - SvREFCNT_dec(sv); - if (ptr) { - const SV * const oval = HeVAL((HE*)ptr); - if (oval && oval != &PL_sv_undef) { - ptr = &HeVAL((HE*)ptr); - if (SvTIED_mg((const SV *)hv, PERL_MAGIC_tied)) - SvREFCNT_inc_void(*(SV**)ptr); - av = MUTABLE_AV(hv); /* what to refcnt_dec */ + { + HE * const he = hv_fetch_ent(ARG2_HV, ARG1_SV, 1, 0); + SvREFCNT_dec(ARG1_SV); + if (LIKELY(he)) { + const SV * const oval = HeVAL(he); + if (LIKELY(oval && oval != &PL_sv_undef)) { + svp = &HeVAL(he); + if (UNLIKELY(SvTIED_mg((const SV *)ARG2_HV, PERL_MAGIC_tied))) + SvREFCNT_inc_void(*svp); + refsv = ARG2_SV; /* what to refcnt_dec */ goto restore_sv; } } - SvREFCNT_dec(hv); - SvREFCNT_dec(value); + SvREFCNT_dec(ARG2_HV); + SvREFCNT_dec(ARG0_SV); break; + } case SAVEt_OP: - PL_op = (OP*)SSPOPPTR; + PL_op = (OP*)ARG0_PTR; break; case SAVEt_HINTS: - if ((PL_hints & HINT_LOCALIZE_HH) && GvHV(PL_hintgv)) { - SvREFCNT_dec(MUTABLE_SV(GvHV(PL_hintgv))); + if ((PL_hints & HINT_LOCALIZE_HH)) { + while (GvHV(PL_hintgv)) { + HV *hv = GvHV(PL_hintgv); GvHV(PL_hintgv) = NULL; + SvREFCNT_dec(MUTABLE_SV(hv)); + } } cophh_free(CopHINTHASH_get(&PL_compiling)); - CopHINTHASH_set(&PL_compiling, (COPHH*)SSPOPPTR); - *(I32*)&PL_hints = (I32)SSPOPINT; + CopHINTHASH_set(&PL_compiling, (COPHH*)ARG0_PTR); + *(I32*)&PL_hints = ARG1_I32; if (PL_hints & HINT_LOCALIZE_HH) { SvREFCNT_dec(MUTABLE_SV(GvHV(PL_hintgv))); GvHV(PL_hintgv) = MUTABLE_HV(SSPOPPTR); - assert(GvHV(PL_hintgv)); - } else if (!GvHV(PL_hintgv)) { - /* Need to add a new one manually, else gv_fetchpv() can - add one in this code: - - if (SvTYPE(gv) == SVt_PVGV) { - if (add) { - GvMULTI_on(gv); - gv_init_sv(gv, sv_type); - if (*name=='!' && sv_type == SVt_PVHV && len==1) - require_errno(gv); - } - return gv; - } - - and it won't have the magic set. */ - + } + if (!GvHV(PL_hintgv)) { + /* Need to add a new one manually, else rv2hv can + add one via GvHVn and it won't have the magic set. */ HV *const hv = newHV(); hv_magic(hv, NULL, PERL_MAGIC_hints); GvHV(PL_hintgv) = hv; @@ -1046,136 +1241,110 @@ Perl_leave_scope(pTHX_ I32 base) assert(GvHV(PL_hintgv)); break; case SAVEt_COMPPAD: - PL_comppad = (PAD*)SSPOPPTR; - if (PL_comppad) + PL_comppad = (PAD*)ARG0_PTR; + if (LIKELY(PL_comppad)) PL_curpad = AvARRAY(PL_comppad); else PL_curpad = NULL; break; case SAVEt_PADSV_AND_MORTALIZE: { - const PADOFFSET off = (PADOFFSET)SSPOPLONG; SV **svp; - ptr = SSPOPPTR; - assert (ptr); - svp = AvARRAY((PAD*)ptr) + off; - /* This mortalizing used to be done by POPLOOP() via itersave. - But as we have all the information here, we can do it here, - save even having to have itersave in the struct. */ + assert (ARG1_PTR); + svp = AvARRAY((PAD*)ARG1_PTR) + (PADOFFSET)arg0.any_uv; + /* This mortalizing used to be done by CX_POOPLOOP() via + itersave. But as we have all the information here, we + can do it here, save even having to have itersave in + the struct. + */ sv_2mortal(*svp); - *svp = MUTABLE_SV(SSPOPPTR); + *svp = ARG2_SV; } break; case SAVEt_SAVESWITCHSTACK: { dSP; - AV *const t = MUTABLE_AV(SSPOPPTR); - AV *const f = MUTABLE_AV(SSPOPPTR); - SWITCHSTACK(t,f); - PL_curstackinfo->si_stack = f; + SWITCHSTACK(ARG0_AV, ARG1_AV); + PL_curstackinfo->si_stack = ARG1_AV; } break; case SAVEt_SET_SVFLAGS: - { - const U32 val = (U32)SSPOPINT; - const U32 mask = (U32)SSPOPINT; - sv = MUTABLE_SV(SSPOPPTR); - SvFLAGS(sv) &= ~mask; - SvFLAGS(sv) |= val; - } + SvFLAGS(ARG2_SV) &= ~((U32)ARG1_I32); + SvFLAGS(ARG2_SV) |= (U32)ARG0_I32; break; - /* This would be a mathom, but Perl_save_svref() calls a static - function, S_save_scalar_at(), so has to stay in this file. */ - case SAVEt_SVREF: /* scalar reference */ - value = MUTABLE_SV(SSPOPPTR); - ptr = SSPOPPTR; - av = NULL; /* what to refcnt_dec */ - goto restore_sv; - /* These are only saved in mathoms.c */ case SAVEt_NSTAB: - gv = MUTABLE_GV(SSPOPPTR); - (void)sv_clear(MUTABLE_SV(gv)); + (void)sv_clear(ARG0_SV); break; case SAVEt_LONG: /* long reference */ - ptr = SSPOPPTR; - *(long*)ptr = (long)SSPOPLONG; + *(long*)ARG0_PTR = arg1.any_long; break; case SAVEt_IV: /* IV reference */ - ptr = SSPOPPTR; - *(IV*)ptr = (IV)SSPOPIV; + *(IV*)ARG0_PTR = arg1.any_iv; break; case SAVEt_I16: /* I16 reference */ - ptr = SSPOPPTR; - *(I16*)ptr = (I16)(uv >> 8); + *(I16*)ARG0_PTR = (I16)(uv >> 8); break; case SAVEt_I8: /* I8 reference */ - ptr = SSPOPPTR; - *(I8*)ptr = (I8)(uv >> 8); + *(I8*)ARG0_PTR = (I8)(uv >> 8); break; case SAVEt_DESTRUCTOR: - ptr = SSPOPPTR; - (*SSPOPDPTR)(ptr); + (*arg1.any_dptr)(ARG0_PTR); break; case SAVEt_COMPILE_WARNINGS: - ptr = SSPOPPTR; - if (!specialWARN(PL_compiling.cop_warnings)) PerlMemShared_free(PL_compiling.cop_warnings); - PL_compiling.cop_warnings = (STRLEN*)ptr; - break; - case SAVEt_RE_STATE: - { - const struct re_save_state *const state - = (struct re_save_state *) - (PL_savestack + PL_savestack_ix - - SAVESTACK_ALLOC_FOR_RE_SAVE_STATE); - PL_savestack_ix -= SAVESTACK_ALLOC_FOR_RE_SAVE_STATE; - - if (PL_reg_start_tmp != state->re_state_reg_start_tmp) { - Safefree(PL_reg_start_tmp); - } - if (PL_reg_poscache != state->re_state_reg_poscache) { - Safefree(PL_reg_poscache); - } - Copy(state, &PL_reg_state, 1, struct re_save_state); - } + PL_compiling.cop_warnings = (STRLEN*)ARG0_PTR; break; case SAVEt_PARSER: - ptr = SSPOPPTR; - parser_free((yy_parser *) ptr); + parser_free((yy_parser *) ARG0_PTR); + break; + case SAVEt_READONLY_OFF: + SvREADONLY_off(ARG0_SV); break; default: - Perl_croak(aTHX_ "panic: leave_scope inconsistency"); + Perl_croak(aTHX_ "panic: leave_scope inconsistency %u", type); } } - PL_tainted = was; - - PERL_ASYNC_CHECK(); + TAINT_set(was); } void Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) { - dVAR; - PERL_ARGS_ASSERT_CX_DUMP; #ifdef DEBUGGING PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), PL_block_type[CxTYPE(cx)]); if (CxTYPE(cx) != CXt_SUBST) { + const char *gimme_text; PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp); PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%"UVxf"\n", PTR2UV(cx->blk_oldcop)); PerlIO_printf(Perl_debug_log, "BLK_OLDMARKSP = %ld\n", (long)cx->blk_oldmarksp); PerlIO_printf(Perl_debug_log, "BLK_OLDSCOPESP = %ld\n", (long)cx->blk_oldscopesp); + PerlIO_printf(Perl_debug_log, "BLK_OLDSAVEIX = %ld\n", (long)cx->blk_oldsaveix); PerlIO_printf(Perl_debug_log, "BLK_OLDPM = 0x%"UVxf"\n", PTR2UV(cx->blk_oldpm)); - PerlIO_printf(Perl_debug_log, "BLK_GIMME = %s\n", cx->blk_gimme ? "LIST" : "SCALAR"); + switch (cx->blk_gimme) { + case G_VOID: + gimme_text = "VOID"; + break; + case G_SCALAR: + gimme_text = "SCALAR"; + break; + case G_ARRAY: + gimme_text = "LIST"; + break; + default: + gimme_text = "UNKNOWN"; + break; + } + PerlIO_printf(Perl_debug_log, "BLK_GIMME = %s\n", gimme_text); } switch (CxTYPE(cx)) { case CXt_NULL: @@ -1219,22 +1388,25 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) PTR2UV(cx->blk_eval.retop)); break; + case CXt_LOOP_PLAIN: case CXt_LOOP_LAZYIV: case CXt_LOOP_LAZYSV: - case CXt_LOOP_FOR: - case CXt_LOOP_PLAIN: + case CXt_LOOP_LIST: + case CXt_LOOP_ARY: PerlIO_printf(Perl_debug_log, "BLK_LOOP.LABEL = %s\n", CxLABEL(cx)); - PerlIO_printf(Perl_debug_log, "BLK_LOOP.RESETSP = %ld\n", - (long)cx->blk_loop.resetsp); PerlIO_printf(Perl_debug_log, "BLK_LOOP.MY_OP = 0x%"UVxf"\n", PTR2UV(cx->blk_loop.my_op)); - /* XXX: not accurate for LAZYSV/IV */ - PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%"UVxf"\n", - PTR2UV(cx->blk_loop.state_u.ary.ary)); - PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n", - (long)cx->blk_loop.state_u.ary.ix); - PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERVAR = 0x%"UVxf"\n", - PTR2UV(CxITERVAR(cx))); + if (CxTYPE(cx) != CXt_LOOP_PLAIN) { + PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERVAR = 0x%"UVxf"\n", + PTR2UV(CxITERVAR(cx))); + PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERSAVE = 0x%"UVxf"\n", + PTR2UV(cx->blk_loop.itersave)); + /* XXX: not accurate for LAZYSV/IV/LIST */ + PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%"UVxf"\n", + PTR2UV(cx->blk_loop.state_u.ary.ary)); + PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n", + (long)cx->blk_loop.state_u.ary.ix); + } break; case CXt_SUBST: @@ -1269,11 +1441,5 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * - * ex: set ts=8 sts=4 sw=4 noet: + * ex: set ts=8 sts=4 sw=4 et: */