diff options
| -rw-r--r-- | embedvar.h | 1 | ||||
| -rw-r--r-- | intrpvar.h | 2 | ||||
| -rw-r--r-- | pad.c | 8 | ||||
| -rw-r--r-- | pad.h | 3 | ||||
| -rw-r--r-- | pp_ctl.c | 2 | ||||
| -rw-r--r-- | toke.c | 3 |
6 files changed, 11 insertions, 8 deletions
diff --git a/embedvar.h b/embedvar.h index 712c259022..9e4a910a57 100644 --- a/embedvar.h +++ b/embedvar.h @@ -230,6 +230,7 @@ #define PL_pad_reset_pending (vTHX->Ipad_reset_pending) #define PL_padix (vTHX->Ipadix) #define PL_padix_floor (vTHX->Ipadix_floor) +#define PL_padlist_generation (vTHX->Ipadlist_generation) #define PL_padname_const (vTHX->Ipadname_const) #define PL_padname_undef (vTHX->Ipadname_undef) #define PL_parser (vTHX->Iparser) diff --git a/intrpvar.h b/intrpvar.h index 6397eb634b..39eac06454 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -744,6 +744,8 @@ PERLVAR(I, debug_pad, struct perl_debug_pad) /* always needed because of the re /* Hook for File::Glob */ PERLVARI(I, globhook, globhook_t, NULL) +PERLVARI(I, padlist_generation, U32, 1) /* id to identify padlist clones */ + /* The last unconditional member of the interpreter structure when 5.21.7 was released. The offset of the end of this is baked into a global variable in any shared perl library which will allow a sanity test in future perl @@ -236,6 +236,7 @@ Perl_pad_new(pTHX_ int flags) 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); @@ -1964,8 +1965,7 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside, bool newcv) 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 ); @@ -1988,6 +1988,7 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside, bool newcv) 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); @@ -1996,8 +1997,7 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside, bool newcv) 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; @@ -34,7 +34,8 @@ typedef U64TYPE PADOFFSET; struct padlist { SSize_t xpadl_max; /* max index for which array has space */ PAD ** xpadl_alloc; /* pointer to beginning of array of AVs */ - PADNAMELIST*xpadl_outid; /* Padnamelist of outer pad; used as ID */ + U32 xpadl_id; /* Semi-unique ID, shared between clones */ + U32 xpadl_outid; /* ID of outer pad */ }; struct padnamelist { @@ -3297,7 +3297,7 @@ Perl_find_runcv_where(pTHX_ U8 cond, IV arg, U32 *db_seqp) switch (cond) { case FIND_RUNCV_padid_eq: if (!CvPADLIST(cv) - || PadlistNAMES(CvPADLIST(cv)) != INT2PTR(PADNAMELIST *, arg)) + || CvPADLIST(cv)->xpadl_id != (U32)arg) continue; return cv; case FIND_RUNCV_level_eq: @@ -10557,8 +10557,7 @@ Perl_start_subparse(pTHX_ I32 is_format, U32 flags) CvOUTSIDE(PL_compcv) = MUTABLE_CV(SvREFCNT_inc_simple(outsidecv)); CvOUTSIDE_SEQ(PL_compcv) = PL_cop_seqmax; if (outsidecv && CvPADLIST(outsidecv)) - CvPADLIST(PL_compcv)->xpadl_outid = - PadlistNAMES(CvPADLIST(outsidecv)); + CvPADLIST(PL_compcv)->xpadl_outid = CvPADLIST(outsidecv)->xpadl_id; return oldsavestack_ix; } |