X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pad.c;h=0c00cfff6b0c2488676fd77270871a49057edcbc;hb=28a4f200aaf4705198a8689fe5f7fabc732dc669;hp=0dfc989b2e3274cebfcdc0b5fc720034fa3c28d2;hpb=a3985cdcc04b13974afc5f4635645003847806e4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pad.c b/pad.c index 0dfc989..0c00cff 100644 --- a/pad.c +++ b/pad.c @@ -1,6 +1,6 @@ /* pad.c * - * Copyright (c) 2002, Larry Wall + * Copyright (C) 2002, 2003, 2004, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -22,12 +22,18 @@ /* =head1 Pad Data Structures +This file contains the functions that create and manipulate scratchpads, +which are array-of-array data structures attached to a CV (ie a sub) +and which store lexical variables and opcode temporary and per-thread +values. + =for apidoc m|AV *|CvPADLIST|CV *cv CV's can have CvPADLIST(cv) set to point to an AV. For these purposes "forms" are a kind-of CV, eval""s are too (except they're not callable at will and are always thrown away after the eval"" is done -executing). +executing). Require'd files are simply evals without any outer lexical +scope. XSUBs don't have CvPADLIST set - dXSTARG fetches values from PL_curpad, but that is really the callers pad (a slot of which is allocated by @@ -46,9 +52,9 @@ The 0'th slot of a frame AV is an AV which is @_. other entries are storage for variables and op targets. During compilation: -C is set the the the names AV. -C is set the the frame AV for the frame CvDEPTH == 1. -C is set the body of the frame AV (i.e. AvARRAY(PL_comppad)). +C is set to the names AV. +C is set to the frame AV for the frame CvDEPTH == 1. +C is set to the body of the frame AV (i.e. AvARRAY(PL_comppad)). During execution, C and C refer to the live frame of the currently executing sub. @@ -73,14 +79,29 @@ stash of the associated global (so that duplicate C delarations in the same package can be detected). SvCUR is sometimes hijacked to store the generation number during compilation. -If SvFAKE is set on the name SV then slot in the frame AVs are -a REFCNT'ed references to a lexical from "outside". +If SvFAKE is set on the name SV, then that slot in the frame AV is +a REFCNT'ed reference to a lexical from "outside". In this case, +the name SV does not use NVX and IVX to store a cop_seq range, since it is +in scope throughout. Instead IVX stores some flags containing info about +the real lexical (is it declared in an anon, and is it capable of being +instantiated multiple times?), and for fake ANONs, NVX contains the index +within the parent's pad where the lexical's value is stored, to make +cloning quicker. -If the 'name' is '&' the the corresponding entry in frame AV +If the 'name' is '&' the corresponding entry in frame AV is a CV representing a possible closure. (SvFAKE and name of '&' is not a meaningful combination currently but could become so if C is implemented.) +Note that formats are treated as anon subs, and are cloned each time +write is called (if necessary). + +The flag SVf_PADSTALE is cleared on lexicals each time the my() is executed, +and set on scope exit. This allows the 'Variable $x is not available' warning +to be generated in evals, such as + + { my $x = 1; sub f { eval '$x'} } f(); + =cut */ @@ -109,7 +130,7 @@ can be OR'ed together: */ PADLIST * -Perl_pad_new(pTHX_ padnew_flags flags) +Perl_pad_new(pTHX_ int flags) { AV *padlist, *padname, *pad, *a0; @@ -131,6 +152,7 @@ Perl_pad_new(pTHX_ padnew_flags flags) SAVEI32(PL_comppad_name_fill); SAVEI32(PL_min_intro_pending); SAVEI32(PL_max_intro_pending); + SAVEI32(PL_cv_has_eval); if (flags & padnew_SAVESUB) { SAVEI32(PL_pad_reset_pending); } @@ -174,12 +196,13 @@ Perl_pad_new(pTHX_ padnew_flags flags) PL_comppad_name_fill = 0; PL_min_intro_pending = 0; PL_padix = 0; + PL_cv_has_eval = 0; } DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad 0x%"UVxf"[0x%"UVxf"] new: padlist=0x%"UVxf + "Pad 0x%"UVxf"[0x%"UVxf"] new: compcv=0x%"UVxf " name=0x%"UVxf" flags=0x%"UVxf"\n", - PTR2UV(PL_comppad), PTR2UV(PL_curpad), PTR2UV(padlist), + PTR2UV(PL_comppad), PTR2UV(PL_curpad), PTR2UV(PL_compcv), PTR2UV(padname), (UV)flags ) ); @@ -196,6 +219,9 @@ PL_*pad* global vars so that we don't have any dangling references left. We also repoint the CvOUTSIDE of any about-to-be-orphaned inner subs to the outer of this cv. +(This function should really be called pad_free, but the name was already +taken) + =cut */ @@ -211,19 +237,19 @@ Perl_pad_undef(pTHX_ CV* cv) return; DEBUG_X(PerlIO_printf(Perl_debug_log, - "Pad undef: padlist=0x%"UVxf"\n" , PTR2UV(padlist)) + "Pad undef: cv=0x%"UVxf" padlist=0x%"UVxf"\n", + PTR2UV(cv), PTR2UV(padlist)) ); - /* pads may be cleared out already during global destruction */ - if ((CvEVAL(cv) && !CvGV(cv) /* is this eval"" ? */ - && !PL_dirty) || CvSPECIAL(cv)) - { - CV *outercv = CvOUTSIDE(cv); - U32 seq = CvOUTSIDE_SEQ(cv); - /* XXX DAPM the following code is very similar to - * pad_fixup_inner_anons(). Merge??? */ + /* detach any '&' anon children in the pad; if afterwards they + * are still live, fix up their CvOUTSIDEs to point to our outside, + * bypassing us. */ + /* XXX DAPM for efficiency, we should only do this if we know we have + * children, or integrate this loop with general cleanup */ - /* inner references to eval's/BEGIN's/etc cv must be fixed up */ + if (!PL_dirty) { /* don't bother during global destruction */ + CV *outercv = CvOUTSIDE(cv); + U32 seq = CvOUTSIDE_SEQ(cv); AV *comppad_name = (AV*)AvARRAY(padlist)[0]; SV **namepad = AvARRAY(comppad_name); AV *comppad = (AV*)AvARRAY(padlist)[1]; @@ -231,25 +257,37 @@ Perl_pad_undef(pTHX_ CV* cv) for (ix = AvFILLp(comppad_name); ix > 0; ix--) { SV *namesv = namepad[ix]; if (namesv && namesv != &PL_sv_undef - && *SvPVX(namesv) == '&' - && ix <= AvFILLp(comppad)) + && *SvPVX(namesv) == '&') { CV *innercv = (CV*)curpad[ix]; - if (innercv && SvTYPE(innercv) == SVt_PVCV + namepad[ix] = Nullsv; + SvREFCNT_dec(namesv); + + if (SvREFCNT(comppad) < 2) { /* allow for /(?{ sub{} })/ */ + curpad[ix] = Nullsv; + SvREFCNT_dec(innercv); + } + if (SvREFCNT(innercv) /* in use, not just a prototype */ && CvOUTSIDE(innercv) == cv) { - CvOUTSIDE(innercv) = outercv; - CvOUTSIDE_SEQ(innercv) = seq; - /* anon prototypes aren't refcounted */ - if (!CvANON(innercv) || CvCLONED(innercv)) { - (void)SvREFCNT_inc(outercv); - if (SvREFCNT(cv)) - SvREFCNT_dec(cv); + assert(CvWEAKOUTSIDE(innercv)); + /* don't relink to grandfather if he's being freed */ + if (outercv && SvREFCNT(outercv)) { + CvWEAKOUTSIDE_off(innercv); + CvOUTSIDE(innercv) = outercv; + CvOUTSIDE_SEQ(innercv) = seq; + SvREFCNT_inc(outercv); } + else { + CvOUTSIDE(innercv) = Nullcv; + } + } + } } } + ix = AvFILLp(padlist); while (ix >= 0) { SV* sv = AvARRAY(padlist)[ix--]; @@ -273,51 +311,26 @@ Perl_pad_undef(pTHX_ CV* cv) /* =for apidoc pad_add_name -Create a new name in the current pad at the specified offset. +Create a new name and associated PADMY SV in the current pad; return the +offset. If C is valid, the name is for a typed lexical; set the name's stash to that value. If C is valid, it's an our lexical, set the name's GvSTASH to that value -Also, if the name is @.. or %.., create a new array or hash for that slot - If fake, it means we're cloning an existing entry =cut */ -/* - * XXX DAPM this doesn't seem the right place to create a new array/hash. - * Whatever we do, we should be consistent - create scalars too, and - * create even if fake. Really need to integrate better the whole entry - * creation business - when + where does the name and value get created? - */ - PADOFFSET Perl_pad_add_name(pTHX_ char *name, HV* typestash, HV* ourstash, bool fake) { PADOFFSET offset = pad_alloc(OP_PADSV, SVs_PADMY); SV* namesv = NEWSV(1102, 0); - U32 min, max; ASSERT_CURPAD_ACTIVE("pad_add_name"); - if (fake) { - min = PL_curcop->cop_seq; - max = PAD_MAX; - } - else { - /* not yet introduced */ - min = PAD_MAX; - max = 0; - } - - DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad addname: %ld \"%s\", (%lu,%lu)%s\n", - (long)offset, name, (unsigned long)min, (unsigned long)max, - (fake ? " FAKE" : "") - ) - ); sv_upgrade(namesv, ourstash ? SVt_PVGV : typestash ? SVt_PVMG : SVt_PVNV); sv_setpv(namesv, name); @@ -332,14 +345,20 @@ Perl_pad_add_name(pTHX_ char *name, HV* typestash, HV* ourstash, bool fake) } av_store(PL_comppad_name, offset, namesv); - SvNVX(namesv) = (NV)min; - SvIVX(namesv) = max; - if (fake) + if (fake) { SvFAKE_on(namesv); + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad addname: %ld \"%s\" FAKE\n", (long)offset, name)); + } else { + /* not yet introduced */ + SvNVX(namesv) = (NV)PAD_MAX; /* min */ + SvIVX(namesv) = 0; /* max */ + if (!PL_min_intro_pending) PL_min_intro_pending = offset; PL_max_intro_pending = offset; + /* if it's not a simple scalar, replace with an AV or HV */ /* XXX DAPM since slot has been allocated, replace * av_store with PL_curpad[offset] ? */ if (*name == '@') @@ -347,6 +366,9 @@ Perl_pad_add_name(pTHX_ char *name, HV* typestash, HV* ourstash, bool fake) else if (*name == '%') av_store(PL_comppad, offset, (SV*)newHV()); SvPADMY_on(PL_curpad[offset]); + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad addname: %ld \"%s\" new lex=0x%"UVxf"\n", + (long)offset, name, PTR2UV(PL_curpad[offset]))); } return offset; @@ -382,9 +404,7 @@ Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype) if (PL_pad_reset_pending) pad_reset(); if (tmptype & SVs_PADMY) { - do { - sv = *av_fetch(PL_comppad, AvFILLp(PL_comppad) + 1, TRUE); - } while (SvPADBUSY(sv)); /* need a fresh one */ + sv = *av_fetch(PL_comppad, AvFILLp(PL_comppad) + 1, TRUE); retval = AvFILLp(PL_comppad); } else { @@ -441,6 +461,14 @@ Perl_pad_add_anon(pTHX_ SV* sv, OPCODE op_type) /* XXX DAPM use PL_curpad[] ? */ av_store(PL_comppad, ix, sv); SvPADMY_on(sv); + + /* to avoid ref loops, we never have parent + child referencing each + * other simultaneously */ + if (CvOUTSIDE((CV*)sv)) { + assert(!CvWEAKOUTSIDE((CV*)sv)); + CvWEAKOUTSIDE_on((CV*)sv); + SvREFCNT_dec(CvOUTSIDE((CV*)sv)); + } return ix; } @@ -478,6 +506,7 @@ Perl_pad_check_dup(pTHX_ char *name, bool is_our, HV *ourstash) for (off = top; (I32)off > PL_comppad_name_floor; off--) { if ((sv = svp[off]) && sv != &PL_sv_undef + && !SvFAKE(sv) && (SvIVX(sv) == PAD_MAX || SvIVX(sv) == 0) && (!is_our || ((SvFLAGS(sv) & SVpad_OUR) && GvSTASH(sv) == ourstash)) @@ -497,6 +526,7 @@ Perl_pad_check_dup(pTHX_ char *name, bool is_our, HV *ourstash) do { if ((sv = svp[off]) && sv != &PL_sv_undef + && !SvFAKE(sv) && (SvIVX(sv) == PAD_MAX || SvIVX(sv) == 0) && ((SvFLAGS(sv) & SVpad_OUR) && GvSTASH(sv) == ourstash) && strEQ(name, SvPVX(sv))) @@ -512,7 +542,6 @@ Perl_pad_check_dup(pTHX_ char *name, bool is_our, HV *ourstash) } - /* =for apidoc pad_findmy @@ -528,206 +557,296 @@ Returns the offset in the current pad, or NOT_IN_PAD on failure. PADOFFSET Perl_pad_findmy(pTHX_ char *name) { - I32 off; - I32 pendoff = 0; - SV *sv; - SV **svp = AvARRAY(PL_comppad_name); - U32 seq = PL_cop_seqmax; - - ASSERT_CURPAD_ACTIVE("pad_findmy"); - DEBUG_Xv(PerlIO_printf(Perl_debug_log, "Pad findmy: \"%s\"\n", name)); - - /* The one we're looking for is probably just before comppad_name_fill. */ - for (off = AvFILLp(PL_comppad_name); off > 0; off--) { - if ((sv = svp[off]) && - sv != &PL_sv_undef && - (!SvIVX(sv) || - (seq <= (U32)SvIVX(sv) && - seq > (U32)I_32(SvNVX(sv)))) && - strEQ(SvPVX(sv), name)) - { - if (SvIVX(sv) || SvFLAGS(sv) & SVpad_OUR) - return (PADOFFSET)off; - pendoff = off; /* this pending def. will override import */ - } + SV *out_sv; + int out_flags; + I32 offset; + AV *nameav; + SV **name_svp; + + offset = pad_findlex(name, PL_compcv, PL_cop_seqmax, 1, + Null(SV**), &out_sv, &out_flags); + if (offset != NOT_IN_PAD) + return offset; + + /* look for an our that's being introduced; this allows + * our $foo = 0 unless defined $foo; + * to not give a warning. (Yes, this is a hack) */ + + nameav = (AV*)AvARRAY(CvPADLIST(PL_compcv))[0]; + name_svp = AvARRAY(nameav); + for (offset = AvFILLp(nameav); offset > 0; offset--) { + SV *namesv = name_svp[offset]; + if (namesv && namesv != &PL_sv_undef + && !SvFAKE(namesv) + && (SvFLAGS(namesv) & SVpad_OUR) + && strEQ(SvPVX(namesv), name) + && U_32(SvNVX(namesv)) == PAD_MAX /* min */ + ) + return offset; } - - /* See if it's in a nested scope */ - off = pad_findlex(name, 0, PL_compcv); - if (!off) /* pad_findlex returns 0 for failure...*/ - return NOT_IN_PAD; /* ...but we return NOT_IN_PAD for failure */ - - /* If there is a pending local definition, this new alias must die */ - if (pendoff) - SvIVX(AvARRAY(PL_comppad_name)[off]) = seq; - return off; + return NOT_IN_PAD; } +/* + * Returns the offset of a lexical $_, if there is one, at run time. + * Used by the UNDERBAR XS macro. + */ +PADOFFSET +Perl_find_rundefsvoffset(pTHX) +{ + SV *out_sv; + int out_flags; + return pad_findlex("$_", find_runcv(NULL), PL_curcop->cop_seq, 1, + Null(SV**), &out_sv, &out_flags); +} /* =for apidoc pad_findlex Find a named lexical anywhere in a chain of nested pads. Add fake entries -in the inner pads if it's found in an outer one. innercv is the CV *inside* -the chain of outer CVs to be searched. If newoff is non-null, this is a -run-time cloning: don't add fake entries, just find the lexical and add a -ref to it at newoff in the current pad. +in the inner pads if it's found in an outer one. + +Returns the offset in the bottom pad of the lex or the fake lex. +cv is the CV in which to start the search, and seq is the current cop_seq +to match against. If warn is true, print appropriate warnings. The out_* +vars return values, and so are pointers to where the returned values +should be stored. out_capture, if non-null, requests that the innermost +instance of the lexical is captured; out_name_sv is set to the innermost +matched namesv or fake namesv; out_flags returns the flags normally +associated with the IVX field of a fake namesv. + +Note that pad_findlex() is recursive; it recurses up the chain of CVs, +then comes back down, adding fake entries as it goes. It has to be this way +because fake namesvs in anon protoypes have to store in NVX the index into +the parent pad. =cut */ +/* Flags set in the SvIVX field of FAKE namesvs */ + +#define PAD_FAKELEX_ANON 1 /* the lex is declared in an ANON, or ... */ +#define PAD_FAKELEX_MULTI 2 /* the lex can be instantiated multiple times */ + +/* the CV has finished being compiled. This is not a sufficient test for + * all CVs (eg XSUBs), but suffices for the CVs found in a lexical chain */ +#define CvCOMPILED(cv) CvROOT(cv) + +/* the CV does late binding of its lexicals */ +#define CvLATE(cv) (CvANON(cv) || SvTYPE(cv) == SVt_PVFM) + + STATIC PADOFFSET -S_pad_findlex(pTHX_ char *name, PADOFFSET newoff, CV* innercv) +S_pad_findlex(pTHX_ char *name, CV* cv, U32 seq, int warn, + SV** out_capture, SV** out_name_sv, int *out_flags) { - CV *cv; - I32 off; - SV *sv; - CV* startcv; - U32 seq; + I32 offset, new_offset; + SV *new_capture; + SV **new_capturep; + AV *padlist = CvPADLIST(cv); + + *out_flags = 0; - ASSERT_CURPAD_ACTIVE("pad_findlex"); DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex: \"%s\" off=%ld startcv=0x%"UVxf"\n", - name, (long)newoff, PTR2UV(innercv)) - ); + "Pad findlex cv=0x%"UVxf" searching \"%s\" seq=%d%s\n", + PTR2UV(cv), name, (int)seq, out_capture ? " capturing" : "" )); - seq = CvOUTSIDE_SEQ(innercv); - startcv = CvOUTSIDE(innercv); + /* first, search this pad */ - for (cv = startcv; cv; seq = CvOUTSIDE_SEQ(cv), cv = CvOUTSIDE(cv)) { - AV *curlist = CvPADLIST(cv); - SV **svp = av_fetch(curlist, 0, FALSE); - AV *curname; + if (padlist) { /* not an undef CV */ + I32 fake_offset = 0; + AV *nameav = (AV*)AvARRAY(padlist)[0]; + SV **name_svp = AvARRAY(nameav); - DEBUG_Xv(PerlIO_printf(Perl_debug_log, - " searching: cv=0x%"UVxf" seq=%d\n", - PTR2UV(cv), (int) seq ) - ); - - if (!svp || *svp == &PL_sv_undef) - continue; - curname = (AV*)*svp; - svp = AvARRAY(curname); - for (off = AvFILLp(curname); off > 0; off--) { - I32 depth; - AV *oldpad; - SV *oldsv; - - if ( ! ( - (sv = svp[off]) && - sv != &PL_sv_undef && - seq <= (U32)SvIVX(sv) && - seq > (U32)I_32(SvNVX(sv)) && - strEQ(SvPVX(sv), name)) - ) - continue; + for (offset = AvFILLp(nameav); offset > 0; offset--) { + SV *namesv = name_svp[offset]; + if (namesv && namesv != &PL_sv_undef + && strEQ(SvPVX(namesv), name)) + { + if (SvFAKE(namesv)) + fake_offset = offset; /* in case we don't find a real one */ + else if ( seq > U_32(SvNVX(namesv)) /* min */ + && seq <= (U32)SvIVX(namesv)) /* max */ + break; + } + } - depth = CvDEPTH(cv); - if (!depth) { - if (newoff) { - if (SvFAKE(sv)) - continue; - return 0; /* don't clone from inactive stack frame */ - } - depth = 1; + if (offset > 0 || fake_offset > 0 ) { /* a match! */ + if (offset > 0) { /* not fake */ + fake_offset = 0; + *out_name_sv = name_svp[offset]; /* return the namesv */ + + /* set PAD_FAKELEX_MULTI if this lex can have multiple + * instances. For now, we just test !CvUNIQUE(cv), but + * ideally, we should detect my's declared within loops + * etc - this would allow a wider range of 'not stayed + * shared' warnings. We also treated alreadly-compiled + * lexes as not multi as viewed from evals. */ + + *out_flags = CvANON(cv) ? + PAD_FAKELEX_ANON : + (!CvUNIQUE(cv) && ! CvCOMPILED(cv)) + ? PAD_FAKELEX_MULTI : 0; + + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad findlex cv=0x%"UVxf" matched: offset=%ld (%ld,%ld)\n", + PTR2UV(cv), (long)offset, (long)U_32(SvNVX(*out_name_sv)), + (long)SvIVX(*out_name_sv))); + } + else { /* fake match */ + offset = fake_offset; + *out_name_sv = name_svp[offset]; /* return the namesv */ + *out_flags = SvIVX(*out_name_sv); + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad findlex cv=0x%"UVxf" matched: offset=%ld flags=0x%lx index=%lu\n", + PTR2UV(cv), (long)offset, (unsigned long)*out_flags, + (unsigned long)SvNVX(*out_name_sv) + )); } - oldpad = (AV*)AvARRAY(curlist)[depth]; - oldsv = *av_fetch(oldpad, off, TRUE); + /* return the lex? */ - DEBUG_Xv(PerlIO_printf(Perl_debug_log, - " matched: offset %ld" - " %s(%lu,%lu), sv=0x%"UVxf"\n", - (long)off, - SvFAKE(sv) ? "FAKE " : "", - (unsigned long)I_32(SvNVX(sv)), - (unsigned long)SvIVX(sv), - PTR2UV(oldsv) - ) - ); + if (out_capture) { - if (!newoff) { /* Not a mere clone operation. */ - newoff = pad_add_name( - SvPVX(sv), - (SvFLAGS(sv) & SVpad_TYPED) ? SvSTASH(sv) : Nullhv, - (SvFLAGS(sv) & SVpad_OUR) ? GvSTASH(sv) : Nullhv, - 1 /* fake */ - ); + /* our ? */ + if ((SvFLAGS(*out_name_sv) & SVpad_OUR)) { + *out_capture = Nullsv; + return offset; + } - if (CvANON(PL_compcv) || SvTYPE(PL_compcv) == SVt_PVFM) { - /* "It's closures all the way down." */ - CvCLONE_on(PL_compcv); - if (cv == startcv) { - if (CvANON(PL_compcv)) - oldsv = Nullsv; /* no need to keep ref */ - } - else { - CV *bcv; - for (bcv = startcv; - bcv && bcv != cv && !CvCLONE(bcv); - bcv = CvOUTSIDE(bcv)) - { - if (CvANON(bcv)) { - /* install the missing pad entry in intervening - * nested subs and mark them cloneable. */ - AV *ocomppad_name = PL_comppad_name; - PAD *ocomppad = PL_comppad; - AV *padlist = CvPADLIST(bcv); - PL_comppad_name = (AV*)AvARRAY(padlist)[0]; - PL_comppad = (AV*)AvARRAY(padlist)[1]; - PL_curpad = AvARRAY(PL_comppad); - pad_add_name( - SvPVX(sv), - (SvFLAGS(sv) & SVpad_TYPED) - ? SvSTASH(sv) : Nullhv, - (SvFLAGS(sv) & SVpad_OUR) - ? GvSTASH(sv) : Nullhv, - 1 /* fake */ - ); - - PL_comppad_name = ocomppad_name; - PL_comppad = ocomppad; - PL_curpad = ocomppad ? - AvARRAY(ocomppad) : Null(SV **); - CvCLONE_on(bcv); - } - else { - if (ckWARN(WARN_CLOSURE) - && !CvUNIQUE(bcv) && !CvUNIQUE(cv)) - { - Perl_warner(aTHX_ packWARN(WARN_CLOSURE), - "Variable \"%s\" may be unavailable", - name); - } - break; - } - } - } + /* trying to capture from an anon prototype? */ + if (CvCOMPILED(cv) + ? CvANON(cv) && CvCLONE(cv) && !CvCLONED(cv) + : *out_flags & PAD_FAKELEX_ANON) + { + if (warn && ckWARN(WARN_CLOSURE)) + Perl_warner(aTHX_ packWARN(WARN_CLOSURE), + "Variable \"%s\" is not available", name); + *out_capture = Nullsv; } - else if (!CvUNIQUE(PL_compcv)) { - if (ckWARN(WARN_CLOSURE) && !SvFAKE(sv) && !CvUNIQUE(cv) - && !(SvFLAGS(sv) & SVpad_OUR)) - { + + /* real value */ + else { + int newwarn = warn; + if (!CvCOMPILED(cv) && (*out_flags & PAD_FAKELEX_MULTI) + && warn && ckWARN(WARN_CLOSURE)) { + newwarn = 0; Perl_warner(aTHX_ packWARN(WARN_CLOSURE), "Variable \"%s\" will not stay shared", name); } + + if (fake_offset && CvANON(cv) + && CvCLONE(cv) &&!CvCLONED(cv)) + { + SV *n; + /* not yet caught - look further up */ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad findlex cv=0x%"UVxf" chasing lex in outer pad\n", + PTR2UV(cv))); + n = *out_name_sv; + pad_findlex(name, CvOUTSIDE(cv), CvOUTSIDE_SEQ(cv), + newwarn, out_capture, out_name_sv, out_flags); + *out_name_sv = n; + return offset; + } + + *out_capture = AvARRAY((AV*)AvARRAY(padlist)[ + CvDEPTH(cv) ? CvDEPTH(cv) : 1])[offset]; + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad findlex cv=0x%"UVxf" found lex=0x%"UVxf"\n", + PTR2UV(cv), PTR2UV(*out_capture))); + + if (SvPADSTALE(*out_capture)) { + if (ckWARN(WARN_CLOSURE)) + Perl_warner(aTHX_ packWARN(WARN_CLOSURE), + "Variable \"%s\" is not available", name); + *out_capture = Nullsv; + } + } + if (!*out_capture) { + if (*name == '@') + *out_capture = sv_2mortal((SV*)newAV()); + else if (*name == '%') + *out_capture = sv_2mortal((SV*)newHV()); + else + *out_capture = sv_newmortal(); } } - av_store(PL_comppad, newoff, SvREFCNT_inc(oldsv)); - ASSERT_CURPAD_ACTIVE("pad_findlex 2"); + + return offset; + } + } + + /* it's not in this pad - try above */ + + if (!CvOUTSIDE(cv)) + return NOT_IN_PAD; + + /* out_capture non-null means caller wants us to capture lex; in + * addition we capture ourselves unless it's an ANON/format */ + new_capturep = out_capture ? out_capture : + CvLATE(cv) ? Null(SV**) : &new_capture; + + offset = pad_findlex(name, CvOUTSIDE(cv), CvOUTSIDE_SEQ(cv), 1, + new_capturep, out_name_sv, out_flags); + if (offset == NOT_IN_PAD) + return NOT_IN_PAD; + + /* found in an outer CV. Add appropriate fake entry to this pad */ + + /* don't add new fake entries (via eval) to CVs that we have already + * finished compiling, or to undef CVs */ + if (CvCOMPILED(cv) || !padlist) + return 0; /* this dummy (and invalid) value isnt used by the caller */ + + { + SV *new_namesv; + AV *ocomppad_name = PL_comppad_name; + PAD *ocomppad = PL_comppad; + PL_comppad_name = (AV*)AvARRAY(padlist)[0]; + PL_comppad = (AV*)AvARRAY(padlist)[1]; + PL_curpad = AvARRAY(PL_comppad); + + new_offset = pad_add_name( + SvPVX(*out_name_sv), + (SvFLAGS(*out_name_sv) & SVpad_TYPED) + ? SvSTASH(*out_name_sv) : Nullhv, + (SvFLAGS(*out_name_sv) & SVpad_OUR) + ? GvSTASH(*out_name_sv) : Nullhv, + 1 /* fake */ + ); + + new_namesv = AvARRAY(PL_comppad_name)[new_offset]; + SvIVX(new_namesv) = *out_flags; + + SvNVX(new_namesv) = (NV)0; + if (SvFLAGS(new_namesv) & SVpad_OUR) { + /* do nothing */ + } + else if (CvLATE(cv)) { + /* delayed creation - just note the offset within parent pad */ + SvNVX(new_namesv) = (NV)offset; + CvCLONE_on(cv); + } + else { + /* immediate creation - capture outer value right now */ + av_store(PL_comppad, new_offset, SvREFCNT_inc(*new_capturep)); DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad findlex: set offset %ld to sv 0x%"UVxf"\n", - (long)newoff, PTR2UV(oldsv) - ) - ); - return newoff; + "Pad findlex cv=0x%"UVxf" saved captured sv 0x%"UVxf" at offset %ld\n", + PTR2UV(cv), PTR2UV(*new_capturep), (long)new_offset)); } + *out_name_sv = new_namesv; + *out_flags = SvIVX(new_namesv); + + PL_comppad_name = ocomppad_name; + PL_comppad = ocomppad; + PL_curpad = ocomppad ? AvARRAY(ocomppad) : Null(SV **); } - return 0; + return new_offset; } - + /* =for apidoc pad_sv @@ -833,13 +952,15 @@ Perl_intro_my(pTHX) svp = AvARRAY(PL_comppad_name); for (i = PL_min_intro_pending; i <= PL_max_intro_pending; i++) { - if ((sv = svp[i]) && sv != &PL_sv_undef && !SvIVX(sv)) { + if ((sv = svp[i]) && sv != &PL_sv_undef + && !SvFAKE(sv) && !SvIVX(sv)) + { SvIVX(sv) = PAD_MAX; /* Don't know scope end yet. */ SvNVX(sv) = (NV)PL_cop_seqmax; DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad intromy: %ld \"%s\", (%lu,%lu)\n", + "Pad intromy: %ld \"%s\", (%ld,%ld)\n", (long)i, SvPVX(sv), - (unsigned long)I_32(SvNVX(sv)), (unsigned long)SvIVX(sv)) + (long)U_32(SvNVX(sv)), (long)SvIVX(sv)) ); } } @@ -872,19 +993,22 @@ Perl_pad_leavemy(pTHX) ASSERT_CURPAD_ACTIVE("pad_leavemy"); if (PL_min_intro_pending && PL_comppad_name_fill < PL_min_intro_pending) { for (off = PL_max_intro_pending; off >= PL_min_intro_pending; off--) { - if ((sv = svp[off]) && sv != &PL_sv_undef && ckWARN_d(WARN_INTERNAL)) + if ((sv = svp[off]) && sv != &PL_sv_undef + && !SvFAKE(sv) && ckWARN_d(WARN_INTERNAL)) Perl_warner(aTHX_ packWARN(WARN_INTERNAL), - "%s never introduced", SvPVX(sv)); + "%"SVf" never introduced", sv); } } /* "Deintroduce" my variables that are leaving with this scope. */ for (off = AvFILLp(PL_comppad_name); off > PL_comppad_name_fill; off--) { - if ((sv = svp[off]) && sv != &PL_sv_undef && SvIVX(sv) == PAD_MAX) { + if ((sv = svp[off]) && sv != &PL_sv_undef + && !SvFAKE(sv) && SvIVX(sv) == PAD_MAX) + { SvIVX(sv) = PL_cop_seqmax; DEBUG_Xv(PerlIO_printf(Perl_debug_log, - "Pad leavemy: %ld \"%s\", (%lu,%lu)\n", + "Pad leavemy: %ld \"%s\", (%ld,%ld)\n", (long)off, SvPVX(sv), - (unsigned long)I_32(SvNVX(sv)), (unsigned long)SvIVX(sv)) + (long)U_32(SvNVX(sv)), (long)SvIVX(sv)) ); } } @@ -992,14 +1116,38 @@ void Perl_pad_tidy(pTHX_ padtidy_type type) { PADOFFSET ix; + CV *cv; ASSERT_CURPAD_ACTIVE("pad_tidy"); + + /* If this CV has had any 'eval-capable' ops planted in it + * (ie it contains eval '...', //ee, /$var/ or /(?{..})/), Then any + * anon prototypes in the chain of CVs should be marked as cloneable, + * so that for example the eval's CV in C<< sub { eval '$x' } >> gets + * the right CvOUTSIDE. + * If running with -d, *any* sub may potentially have an eval + * excuted within it. + */ + + if (PL_cv_has_eval || PL_perldb) { + for (cv = PL_compcv ;cv; cv = CvOUTSIDE(cv)) { + if (cv != PL_compcv && CvCOMPILED(cv)) + break; /* no need to mark already-compiled code */ + if (CvANON(cv)) { + DEBUG_Xv(PerlIO_printf(Perl_debug_log, + "Pad clone on cv=0x%"UVxf"\n", PTR2UV(cv))); + CvCLONE_on(cv); + } + } + } + /* extend curpad to match namepad */ if (AvFILLp(PL_comppad_name) < AvFILLp(PL_comppad)) av_store(PL_comppad_name, AvFILLp(PL_comppad), Nullsv); if (type == padtidy_SUBCLONE) { SV **namep = AvARRAY(PL_comppad_name); + for (ix = AvFILLp(PL_comppad); ix > 0; ix--) { SV *namesv; @@ -1007,13 +1155,12 @@ Perl_pad_tidy(pTHX_ padtidy_type type) continue; /* * The only things that a clonable function needs in its - * pad are references to outer lexicals and anonymous subs. + * pad are anonymous subs. * The rest are created anew during cloning. */ if (!((namesv = namep[ix]) != Nullsv && namesv != &PL_sv_undef && - (SvFAKE(namesv) || - *SvPVX(namesv) == '&'))) + *SvPVX(namesv) == '&')) { SvREFCNT_dec(PL_curpad[ix]); PL_curpad[ix] = Nullsv; @@ -1076,13 +1223,15 @@ Perl_pad_free(pTHX_ PADOFFSET po) if (PL_curpad[po] && PL_curpad[po] != &PL_sv_undef) { SvPADTMP_off(PL_curpad[po]); #ifdef USE_ITHREADS + /* SV could be a shared hash key (eg bugid #19022) */ + if ( #ifdef PERL_COPY_ON_WRITE - if (SvIsCOW(PL_curpad[po])) { - sv_force_normal_flags(PL_curpad[po], SV_COW_DROP_PV); - } else + !SvIsCOW(PL_curpad[po]) +#else + !SvFAKE(PL_curpad[po]) #endif + ) SvREADONLY_off(PL_curpad[po]); /* could be a freed constant */ - #endif } if ((I32)po < PL_padix) @@ -1127,16 +1276,27 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full) namesv = Nullsv; } if (namesv) { - Perl_dump_indent(aTHX_ level+1, file, - "%2d. 0x%"UVxf"<%lu> %s (%lu,%lu) \"%s\"\n", - (int) ix, - PTR2UV(ppad[ix]), - (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0), - SvFAKE(namesv) ? "FAKE" : " ", - (unsigned long)I_32(SvNVX(namesv)), - (unsigned long)SvIVX(namesv), - SvPVX(namesv) - ); + if (SvFAKE(namesv)) + Perl_dump_indent(aTHX_ level+1, file, + "%2d. 0x%"UVxf"<%lu> FAKE \"%s\" flags=0x%lx index=%lu\n", + (int) ix, + PTR2UV(ppad[ix]), + (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0), + SvPVX(namesv), + (unsigned long)SvIVX(namesv), + (unsigned long)SvNVX(namesv) + + ); + else + Perl_dump_indent(aTHX_ level+1, file, + "%2d. 0x%"UVxf"<%lu> (%ld,%ld) \"%s\"\n", + (int) ix, + PTR2UV(ppad[ix]), + (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0), + (long)U_32(SvNVX(namesv)), + (long)SvIVX(namesv), + SvPVX(namesv) + ); } else if (full) { Perl_dump_indent(aTHX_ level+1, file, @@ -1171,6 +1331,7 @@ S_cv_dump(pTHX_ CV *cv, char *title) title, PTR2UV(cv), (CvANON(cv) ? "ANON" + : (SvTYPE(cv) == SVt_PVFM) ? "FORMAT" : (cv == PL_main_cv) ? "MAIN" : CvUNIQUE(cv) ? "UNIQUE" : CvGV(cv) ? GvNAME(CvGV(cv)) : "UNDEFINED"), @@ -1204,22 +1365,6 @@ any outer lexicals. CV * Perl_cv_clone(pTHX_ CV *proto) { - CV *cv; - - LOCK_CRED_MUTEX; /* XXX create separate mutex */ - cv = cv_clone2(proto, CvOUTSIDE(proto)); - UNLOCK_CRED_MUTEX; /* XXX create separate mutex */ - return cv; -} - - -/* XXX DAPM separate out cv and paddish bits ??? - * ideally the CV-related stuff shouldn't be in pad.c - how about - * a cv.c? */ - -STATIC CV * -S_cv_clone2(pTHX_ CV *proto, CV *outside) -{ I32 ix; AV* protopadlist = CvPADLIST(proto); AV* protopad_name = (AV*)*av_fetch(protopadlist, 0, FALSE); @@ -1230,15 +1375,31 @@ S_cv_clone2(pTHX_ CV *proto, CV *outside) I32 fpad = AvFILLp(protopad); AV* comppadlist; CV* cv; + SV** outpad; + CV* outside; + long depth; assert(!CvUNIQUE(proto)); + /* Since cloneable anon subs can be nested, CvOUTSIDE may point + * to a prototype; we instead want the cloned parent who called us. + * Note that in general for formats, CvOUTSIDE != find_runcv */ + + outside = CvOUTSIDE(proto); + if (outside && CvCLONE(outside) && ! CvCLONED(outside)) + outside = find_runcv(NULL); + depth = CvDEPTH(outside); + assert(depth || SvTYPE(proto) == SVt_PVFM); + if (!depth) + depth = 1; + assert(CvPADLIST(outside)); + ENTER; SAVESPTR(PL_compcv); cv = PL_compcv = (CV*)NEWSV(1104, 0); sv_upgrade((SV *)cv, SvTYPE(proto)); - CvFLAGS(cv) = CvFLAGS(proto) & ~CVf_CLONE; + CvFLAGS(cv) = CvFLAGS(proto) & ~(CVf_CLONE|CVf_WEAKOUTSIDE); CvCLONED_on(cv); #ifdef USE_ITHREADS @@ -1249,78 +1410,66 @@ S_cv_clone2(pTHX_ CV *proto, CV *outside) #endif CvGV(cv) = CvGV(proto); CvSTASH(cv) = CvSTASH(proto); + OP_REFCNT_LOCK; CvROOT(cv) = OpREFCNT_inc(CvROOT(proto)); + OP_REFCNT_UNLOCK; CvSTART(cv) = CvSTART(proto); - if (outside) { - CvOUTSIDE(cv) = (CV*)SvREFCNT_inc(outside); - CvOUTSIDE_SEQ(cv) = CvOUTSIDE_SEQ(proto); - } + CvOUTSIDE(cv) = (CV*)SvREFCNT_inc(outside); + CvOUTSIDE_SEQ(cv) = CvOUTSIDE_SEQ(proto); if (SvPOK(proto)) sv_setpvn((SV*)cv, SvPVX(proto), SvCUR(proto)); CvPADLIST(cv) = comppadlist = pad_new(padnew_CLONE|padnew_SAVE); + av_fill(PL_comppad, fpad); for (ix = fname; ix >= 0; ix--) av_store(PL_comppad_name, ix, SvREFCNT_inc(pname[ix])); - av_fill(PL_comppad, fpad); PL_curpad = AvARRAY(PL_comppad); + outpad = AvARRAY(AvARRAY(CvPADLIST(outside))[depth]); + for (ix = fpad; ix > 0; ix--) { SV* namesv = (ix <= fname) ? pname[ix] : Nullsv; - if (namesv && namesv != &PL_sv_undef) { - char *name = SvPVX(namesv); /* XXX */ - if (SvFLAGS(namesv) & SVf_FAKE) { /* lexical from outside? */ - I32 off = pad_findlex(name, ix, cv); - if (!off) - PL_curpad[ix] = SvREFCNT_inc(ppad[ix]); - else if (off != ix) - Perl_croak(aTHX_ "panic: cv_clone: %s", name); + SV *sv = Nullsv; + if (namesv && namesv != &PL_sv_undef) { /* lexical */ + if (SvFAKE(namesv)) { /* lexical from outside? */ + sv = outpad[(I32)SvNVX(namesv)]; + assert(sv); + /* formats may have an inactive parent */ + if (SvTYPE(proto) == SVt_PVFM && SvPADSTALE(sv)) { + if (ckWARN(WARN_CLOSURE)) + Perl_warner(aTHX_ packWARN(WARN_CLOSURE), + "Variable \"%s\" is not available", SvPVX(namesv)); + sv = Nullsv; + } + else { + assert(!SvPADSTALE(sv)); + sv = SvREFCNT_inc(sv); + } } - else { /* our own lexical */ - SV* sv; - if (*name == '&') { - /* anon code -- we'll come back for it */ + if (!sv) { + char *name = SvPVX(namesv); + if (*name == '&') sv = SvREFCNT_inc(ppad[ix]); - } else if (*name == '@') sv = (SV*)newAV(); else if (*name == '%') sv = (SV*)newHV(); else sv = NEWSV(0, 0); - if (!SvPADBUSY(sv)) - SvPADMY_on(sv); - PL_curpad[ix] = sv; + SvPADMY_on(sv); } } else if (IS_PADGV(ppad[ix]) || IS_PADCONST(ppad[ix])) { - PL_curpad[ix] = SvREFCNT_inc(ppad[ix]); + sv = SvREFCNT_inc(ppad[ix]); } else { - SV* sv = NEWSV(0, 0); + sv = NEWSV(0, 0); SvPADTMP_on(sv); - PL_curpad[ix] = sv; - } - } - - /* Now that vars are all in place, clone nested closures. */ - - for (ix = fpad; ix > 0; ix--) { - SV* namesv = (ix <= fname) ? pname[ix] : Nullsv; - if (namesv - && namesv != &PL_sv_undef - && !(SvFLAGS(namesv) & SVf_FAKE) - && *SvPVX(namesv) == '&' - && CvCLONE(ppad[ix])) - { - CV *kid = cv_clone2((CV*)ppad[ix], cv); - SvREFCNT_dec(ppad[ix]); - CvCLONE_on(kid); - SvPADMY_on(kid); - PL_curpad[ix] = (SV*)kid; } + PL_curpad[ix] = sv; } DEBUG_Xv( @@ -1333,11 +1482,19 @@ S_cv_clone2(pTHX_ CV *proto, CV *outside) LEAVE; if (CvCONST(cv)) { + /* Constant sub () { $x } closing over $x - see lib/constant.pm: + * The prototype was marked as a candiate for const-ization, + * so try to grab the current const value, and if successful, + * turn into a const sub: + */ SV* const_sv = op_const_sv(CvSTART(cv), cv); - assert(const_sv); - /* constant sub () { $x } closing over $x - see lib/constant.pm */ - SvREFCNT_dec(cv); - cv = newCONSTSUB(CvSTASH(proto), 0, const_sv); + if (const_sv) { + SvREFCNT_dec(cv); + cv = newCONSTSUB(CvSTASH(proto), 0, const_sv); + } + else { + CvCONST_off(cv); + } } return cv; @@ -1348,7 +1505,8 @@ S_cv_clone2(pTHX_ CV *proto, CV *outside) =for apidoc pad_fixup_inner_anons For any anon CVs in the pad, change CvOUTSIDE of that CV from -old_cv to new_cv if necessary. +old_cv to new_cv if necessary. Needed when a newly-compiled CV has to be +moved to a pre-existing CV struct. =cut */ @@ -1367,18 +1525,14 @@ Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv) && *SvPVX(namesv) == '&') { CV *innercv = (CV*)curpad[ix]; - if (CvOUTSIDE(innercv) == old_cv) { - CvOUTSIDE(innercv) = new_cv; - /* anon prototypes aren't refcounted */ - if (!CvANON(innercv) || CvCLONED(innercv)) { - (void)SvREFCNT_inc(new_cv); - SvREFCNT_dec(old_cv); - } - } + assert(CvWEAKOUTSIDE(innercv)); + assert(CvOUTSIDE(innercv) == old_cv); + CvOUTSIDE(innercv) = new_cv; } } } + /* =for apidoc pad_push @@ -1389,6 +1543,9 @@ If has_args is true, give the new pad an @_ in slot zero. =cut */ +/* XXX pad_push is now always called with has_args == 1. Get rid of + * this arg at some point */ + void Perl_pad_push(pTHX_ PADLIST *padlist, int depth, int has_args) {