PadnamelistREFCNT(padname = PL_comppad_name)++;
}
else {
+ padlist->xpadl_id = PL_padlist_generation++;
av_store(pad, 0, NULL);
padname = newPADNAMELIST(0);
padnamelist_store(padname, 0, &PL_padname_undef);
}
/* in use, not just a prototype */
- if (inner_rc && (CvOUTSIDE(innercv) == cv)) {
+ if (inner_rc && SvTYPE(innercv) == SVt_PVCV
+ && (CvOUTSIDE(innercv) == cv))
+ {
assert(CvWEAKOUTSIDE(innercv));
/* don't relink to grandfather if he's being freed */
if (outercv && SvREFCNT(outercv)) {
}
padnamelist_store(PL_comppad_name, offset, name);
- PadnamelistMAXNAMED(PL_comppad_name) = offset;
+ if (PadnameLEN(name) > 1)
+ PadnamelistMAXNAMED(PL_comppad_name) = offset;
return offset;
}
PADNAME * const name = newPADNAMEpvn("&", 1);
PERL_ARGS_ASSERT_PAD_ADD_ANON;
+ assert (SvTYPE(func) == SVt_PVCV);
pad_peg("add_anon");
/* These two aren't used; just make sure they're not equal to
ix = pad_alloc(optype, SVs_PADMY);
padnamelist_store(PL_comppad_name, ix, name);
/* XXX DAPM use PL_curpad[] ? */
- if (SvTYPE(func) == SVt_PVCV || !CvOUTSIDE(func))
- av_store(PL_comppad, ix, (SV*)func);
- else {
- SV *rv = newRV_noinc((SV *)func);
- sv_rvweaken(rv);
- assert (SvTYPE(func) == SVt_PVFM);
- av_store(PL_comppad, ix, rv);
- }
+ av_store(PL_comppad, ix, (SV*)func);
/* to avoid ref loops, we never have parent + child referencing each
* other simultaneously */
- if (CvOUTSIDE(func) && SvTYPE(func) == SVt_PVCV) {
+ if (CvOUTSIDE(func)) {
assert(!CvWEAKOUTSIDE(func));
CvWEAKOUTSIDE_on(func);
SvREFCNT_dec_NN(CvOUTSIDE(func));
return ix;
}
+void
+Perl_pad_add_weakref(pTHX_ CV* func)
+{
+ const PADOFFSET ix = pad_alloc(OP_NULL, SVs_PADMY);
+ PADNAME * const name = newPADNAMEpvn("&", 1);
+ SV * const rv = newRV_inc((SV *)func);
+
+ PERL_ARGS_ASSERT_PAD_ADD_WEAKREF;
+
+ /* These two aren't used; just make sure they're not equal to
+ * PERL_PADSEQ_INTRO. They should be 0 by default. */
+ assert(COP_SEQ_RANGE_LOW (name) != PERL_PADSEQ_INTRO);
+ assert(COP_SEQ_RANGE_HIGH(name) != PERL_PADSEQ_INTRO);
+ padnamelist_store(PL_comppad_name, ix, name);
+ sv_rvweaken(rv);
+ av_store(PL_comppad, ix, rv);
+}
+
/*
=for apidoc pad_check_dup
return 0; /* this dummy (and invalid) value isnt used by the caller */
{
- /* This relies on sv_setsv_flags() upgrading the destination to the same
- type as the source, independent of the flags set, and on it being
- "good" and only copying flag bits and pointers that it understands.
- */
PADNAME *new_name = newPADNAMEouter(*out_name);
PADNAMELIST * const ocomppad_name = PL_comppad_name;
PAD * const ocomppad = PL_comppad;
=cut
*/
-static CV *S_cv_clone(pTHX_ CV *proto, CV *cv, CV *outside);
+static CV *S_cv_clone(pTHX_ CV *proto, CV *cv, CV *outside, HV *cloned);
static CV *
-S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside, bool newcv)
+S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside, HV *cloned,
+ bool newcv)
{
I32 ix;
PADLIST* const protopadlist = CvPADLIST(proto);
const I32 fpad = AvFILLp(protopad);
SV** outpad;
long depth;
- bool subclones = FALSE;
+ U32 subclones = 0;
+ bool trouble = FALSE;
assert(!CvUNIQUE(proto));
outside = CvOUTSIDE(proto);
if ((CvCLONE(outside) && ! CvCLONED(outside))
|| !CvPADLIST(outside)
- || PadlistNAMES(CvPADLIST(outside))
- != protopadlist->xpadl_outid) {
+ || CvPADLIST(outside)->xpadl_id != protopadlist->xpadl_outid) {
outside = find_runcv_where(
FIND_RUNCV_padid_eq, PTR2IV(protopadlist->xpadl_outid), NULL
);
SAVESPTR(PL_comppad_name);
PL_comppad_name = protopad_name;
CvPADLIST_set(cv, pad_new(padnew_CLONE|padnew_SAVE));
+ CvPADLIST(cv)->xpadl_id = protopadlist->xpadl_id;
av_fill(PL_comppad, fpad);
outpad = outside && CvPADLIST(outside)
? AvARRAY(PadlistARRAY(CvPADLIST(outside))[depth])
: NULL;
- if (outpad)
- CvPADLIST(cv)->xpadl_outid = PadlistNAMES(CvPADLIST(outside));
+ if (outpad) CvPADLIST(cv)->xpadl_outid = CvPADLIST(outside)->xpadl_id;
for (ix = fpad; ix > 0; ix--) {
PADNAME* const namesv = (ix <= fname) ? pname[ix] : NULL;
second pass. */
if (SvPAD_STATE(namesv) && !CvCLONED(ppad[ix])) {
assert(SvTYPE(ppad[ix]) == SVt_PVCV);
- subclones = 1;
+ subclones ++;
+ if (CvOUTSIDE(ppad[ix]) != proto)
+ trouble = TRUE;
sv = newSV_type(SVt_PVCV);
CvLEXICAL_on(sv);
}
}
if (subclones)
- for (ix = fpad; ix > 0; ix--) {
+ {
+ if (trouble || cloned) {
+ /* Uh-oh, we have trouble! At least one of the state subs here
+ has its CvOUTSIDE pointer pointing somewhere unexpected. It
+ could be pointing to another state protosub that we are
+ about to clone. So we have to track which sub clones come
+ from which protosubs. If the CvOUTSIDE pointer for a parti-
+ cular sub points to something we have not cloned yet, we
+ delay cloning it. We must loop through the pad entries,
+ until we get a full pass with no cloning. If any uncloned
+ subs remain (probably nested inside anonymous or ‘my’ subs),
+ then they get cloned in a final pass.
+ */
+ bool cloned_in_this_pass;
+ if (!cloned)
+ cloned = (HV *)sv_2mortal((SV *)newHV());
+ do {
+ cloned_in_this_pass = FALSE;
+ for (ix = fpad; ix > 0; ix--) {
+ PADNAME * const name =
+ (ix <= fname) ? pname[ix] : NULL;
+ if (name && name != &PL_padname_undef
+ && !PadnameOUTER(name) && PadnamePV(name)[0] == '&'
+ && PadnameIsSTATE(name) && !CvCLONED(PL_curpad[ix]))
+ {
+ CV * const protokey = CvOUTSIDE(ppad[ix]);
+ CV ** const cvp = protokey == proto
+ ? &cv
+ : (CV **)hv_fetch(cloned, (char *)&protokey,
+ sizeof(CV *), 0);
+ if (cvp && *cvp) {
+ S_cv_clone(aTHX_ (CV *)ppad[ix],
+ (CV *)PL_curpad[ix],
+ *cvp, cloned);
+ (void)hv_store(cloned, (char *)&ppad[ix],
+ sizeof(CV *),
+ SvREFCNT_inc_simple_NN(PL_curpad[ix]),
+ 0);
+ subclones--;
+ cloned_in_this_pass = TRUE;
+ }
+ }
+ }
+ } while (cloned_in_this_pass);
+ if (subclones)
+ for (ix = fpad; ix > 0; ix--) {
+ PADNAME * const name =
+ (ix <= fname) ? pname[ix] : NULL;
+ if (name && name != &PL_padname_undef
+ && !PadnameOUTER(name) && PadnamePV(name)[0] == '&'
+ && PadnameIsSTATE(name) && !CvCLONED(PL_curpad[ix]))
+ S_cv_clone(aTHX_ (CV *)ppad[ix],
+ (CV *)PL_curpad[ix],
+ CvOUTSIDE(ppad[ix]), cloned);
+ }
+ }
+ else for (ix = fpad; ix > 0; ix--) {
PADNAME * const name = (ix <= fname) ? pname[ix] : NULL;
if (name && name != &PL_padname_undef && !PadnameOUTER(name)
&& PadnamePV(name)[0] == '&' && PadnameIsSTATE(name))
- S_cv_clone(aTHX_ (CV *)ppad[ix], (CV *)PL_curpad[ix], cv);
+ S_cv_clone(aTHX_ (CV *)ppad[ix], (CV *)PL_curpad[ix], cv,
+ NULL);
}
+ }
if (newcv) SvREFCNT_inc_simple_void_NN(cv);
LEAVE;
nextstate
padsv
*/
- if (OP_SIBLING(
+ if (OpSIBLING(
cUNOPx(cUNOPx(CvROOT(cv))->op_first)->op_first
) == o
- && !OP_SIBLING(o))
+ && !OpSIBLING(o))
{
Perl_ck_warner_d(aTHX_
packWARN(WARN_DEPRECATED),
}
static CV *
-S_cv_clone(pTHX_ CV *proto, CV *cv, CV *outside)
+S_cv_clone(pTHX_ CV *proto, CV *cv, CV *outside, HV *cloned)
{
#ifdef USE_ITHREADS
dVAR;
mg_copy((SV *)proto, (SV *)cv, 0, 0);
if (CvPADLIST(proto))
- cv = S_cv_clone_pad(aTHX_ proto, cv, outside, newcv);
+ cv = S_cv_clone_pad(aTHX_ proto, cv, outside, cloned, newcv);
DEBUG_Xv(
PerlIO_printf(Perl_debug_log, "\nPad CV clone\n");
PERL_ARGS_ASSERT_CV_CLONE;
if (!CvPADLIST(proto)) Perl_croak(aTHX_ "panic: no pad in cv_clone");
- return S_cv_clone(aTHX_ proto, NULL, NULL);
+ return S_cv_clone(aTHX_ proto, NULL, NULL, NULL);
}
/* Called only by pp_clonecv */
{
PERL_ARGS_ASSERT_CV_CLONE_INTO;
cv_undef(target);
- return S_cv_clone(aTHX_ proto, target, NULL);
+ return S_cv_clone(aTHX_ proto, target, NULL, NULL);
}
/*
PERL_UNUSED_ARG(old_cv);
for (ix = PadnamelistMAX(comppad_name); ix > 0; ix--) {
- const PADNAME * const name = namepad[ix];
- if (name && name != &PL_padname_undef && !PadnameIsSTATE(name)
+ const PADNAME *name = namepad[ix];
+ if (name && name != &PL_padname_undef && !PadnameIsOUR(name)
&& *PadnamePV(name) == '&')
{
- if (SvTYPE(curpad[ix]) == SVt_PVCV) {
+ CV *innercv = MUTABLE_CV(curpad[ix]);
+ if (UNLIKELY(PadnameOUTER(name))) {
+ CV *cv = new_cv;
+ PADNAME **names = namepad;
+ PADOFFSET i = ix;
+ while (PadnameOUTER(name)) {
+ cv = CvOUTSIDE(cv);
+ names = PadlistNAMESARRAY(CvPADLIST(cv));
+ i = PARENT_PAD_INDEX(name);
+ name = names[i];
+ }
+ innercv = (CV *)PadARRAY(PadlistARRAY(CvPADLIST(cv))[1])[i];
+ }
+ if (SvTYPE(innercv) == SVt_PVCV) {
/* XXX 0afba48f added code here to check for a proto CV
attached to the pad entry by magic. But shortly there-
after 81df9f6f95 moved the magic to the pad name. The
code here was never updated, so it wasn’t doing anything
and got deleted when PADNAME became a distinct type. Is
there any bug as a result? */
- CV * const innercv = MUTABLE_CV(curpad[ix]);
if (CvOUTSIDE(innercv) == old_cv) {
if (!CvWEAKOUTSIDE(innercv)) {
SvREFCNT_dec(old_cv);
PERL_ARGS_ASSERT_PADLIST_DUP;
- cloneall = param->flags & CLONEf_COPY_STACKS;
+ cloneall = cBOOL(param->flags & CLONEf_COPY_STACKS);
assert (SvREFCNT(PadlistARRAY(srcpad)[1]) == 1);
max = cloneall ? PadlistMAX(srcpad) : 1;
*/
PADNAMELIST *
-Perl_newPADNAMELIST(pTHX_ size_t max)
+Perl_newPADNAMELIST(size_t max)
{
PADNAMELIST *pnl;
Newx(pnl, 1, PADNAMELIST);
*/
PADNAME *
-Perl_padnamelist_fetch(pTHX_ PADNAMELIST *pnl, SSize_t key)
+Perl_padnamelist_fetch(PADNAMELIST *pnl, SSize_t key)
{
PERL_ARGS_ASSERT_PADNAMELIST_FETCH;
ASSUME(key >= 0);
*/
PADNAME *
-Perl_newPADNAMEpvn(pTHX_ const char *s, STRLEN len)
+Perl_newPADNAMEpvn(const char *s, STRLEN len)
{
struct padname_with_str *alloc;
char *alloc2; /* for Newxz */
*/
PADNAME *
-Perl_newPADNAMEouter(pTHX_ PADNAME *outer)
+Perl_newPADNAMEouter(PADNAME *outer)
{
PADNAME *pn;
PERL_ARGS_ASSERT_NEWPADNAMEOUTER;
https://perl5.git.perl.org / perl5.git / blobdiff