X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/64345bb5cdba725a5e2af06c99aa36d8a1b8b873..e4487e9b537f1be1e95aba1c87790c2a411788a7:/sv.c diff --git a/sv.c b/sv.c index 4ca7333..18ba290 100644 --- a/sv.c +++ b/sv.c @@ -123,7 +123,8 @@ called by visit() for each SV]): sv_report_used() / do_report_used() dump all remaining SVs (debugging aid) - sv_clean_objs() / do_clean_objs(),do_clean_named_objs() + sv_clean_objs() / do_clean_objs(),do_clean_named_objs(), + do_clean_named_io_objs() Attempt to free all objects pointed to by RVs, and, unless DISABLE_DESTRUCTOR_KLUDGE is defined, try to do the same for all objects indirectly @@ -147,8 +148,7 @@ Private API to rest of sv.c new_SV(), del_SV(), - new_XIV(), del_XIV(), - new_XNV(), del_XNV(), + new_XPVNV(), del_XPVGV(), etc Public API: @@ -163,26 +163,6 @@ Public API: * "A time to plant, and a time to uproot what was planted..." */ -void -Perl_offer_nice_chunk(pTHX_ void *const chunk, const U32 chunk_size) -{ - dVAR; - void *new_chunk; - U32 new_chunk_size; - - PERL_ARGS_ASSERT_OFFER_NICE_CHUNK; - - new_chunk = (void *)(chunk); - new_chunk_size = (chunk_size); - if (new_chunk_size > PL_nice_chunk_size) { - Safefree(PL_nice_chunk); - PL_nice_chunk = (char *) new_chunk; - PL_nice_chunk_size = new_chunk_size; - } else { - Safefree(chunk); - } -} - #ifdef PERL_MEM_LOG # define MEM_LOG_NEW_SV(sv, file, line, func) \ Perl_mem_log_new_sv(sv, file, line, func) @@ -255,17 +235,9 @@ S_more_sv(pTHX) { dVAR; SV* sv; - - if (PL_nice_chunk) { - sv_add_arena(PL_nice_chunk, PL_nice_chunk_size, 0); - PL_nice_chunk = NULL; - PL_nice_chunk_size = 0; - } - else { - char *chunk; /* must use New here to match call to */ - Newx(chunk,PERL_ARENA_SIZE,char); /* Safefree() in sv_free_arenas() */ - sv_add_arena(chunk, PERL_ARENA_SIZE, 0); - } + char *chunk; /* must use New here to match call to */ + Newx(chunk,PERL_ARENA_SIZE,char); /* Safefree() in sv_free_arenas() */ + sv_add_arena(chunk, PERL_ARENA_SIZE, 0); uproot_SV(sv); return sv; } @@ -294,7 +266,7 @@ S_new_SV(pTHX_ const char *file, int line, const char *func) : 0 ); sv->sv_debug_inpad = 0; - sv->sv_debug_cloned = 0; + sv->sv_debug_parent = NULL; sv->sv_debug_file = PL_curcop ? savepv(CopFILE(PL_curcop)): NULL; sv->sv_debug_serial = PL_sv_serial++; @@ -503,32 +475,74 @@ do_clean_objs(pTHX_ SV *const ref) /* XXX Might want to check arrays, etc. */ } -/* called by sv_clean_objs() for each live SV */ #ifndef DISABLE_DESTRUCTOR_KLUDGE + +/* clear any slots in a GV which hold objects - except IO; + * called by sv_clean_objs() for each live GV */ + static void do_clean_named_objs(pTHX_ SV *const sv) { dVAR; + SV *obj; assert(SvTYPE(sv) == SVt_PVGV); assert(isGV_with_GP(sv)); - if (GvGP(sv)) { - if (( -#ifdef PERL_DONT_CREATE_GVSV - GvSV(sv) && -#endif - SvOBJECT(GvSV(sv))) || - (GvAV(sv) && SvOBJECT(GvAV(sv))) || - (GvHV(sv) && SvOBJECT(GvHV(sv))) || - /* In certain rare cases GvIOp(sv) can be NULL, which would make SvOBJECT(GvIO(sv)) dereference NULL. */ - (GvIO(sv) ? (SvFLAGS(GvIOp(sv)) & SVs_OBJECT) : 0) || - (GvCV(sv) && SvOBJECT(GvCV(sv))) ) - { - DEBUG_D((PerlIO_printf(Perl_debug_log, "Cleaning named glob object:\n "), sv_dump(sv))); - SvFLAGS(sv) |= SVf_BREAK; - SvREFCNT_dec(sv); - } + if (!GvGP(sv)) + return; + + /* freeing GP entries may indirectly free the current GV; + * hold onto it while we mess with the GP slots */ + SvREFCNT_inc(sv); + + if ( ((obj = GvSV(sv) )) && SvOBJECT(obj)) { + DEBUG_D((PerlIO_printf(Perl_debug_log, + "Cleaning named glob SV object:\n "), sv_dump(obj))); + GvSV(sv) = NULL; + SvREFCNT_dec(obj); + } + if ( ((obj = MUTABLE_SV(GvAV(sv)) )) && SvOBJECT(obj)) { + DEBUG_D((PerlIO_printf(Perl_debug_log, + "Cleaning named glob AV object:\n "), sv_dump(obj))); + GvAV(sv) = NULL; + SvREFCNT_dec(obj); + } + if ( ((obj = MUTABLE_SV(GvHV(sv)) )) && SvOBJECT(obj)) { + DEBUG_D((PerlIO_printf(Perl_debug_log, + "Cleaning named glob HV object:\n "), sv_dump(obj))); + GvHV(sv) = NULL; + SvREFCNT_dec(obj); + } + if ( ((obj = MUTABLE_SV(GvCV(sv)) )) && SvOBJECT(obj)) { + DEBUG_D((PerlIO_printf(Perl_debug_log, + "Cleaning named glob CV object:\n "), sv_dump(obj))); + GvCV(sv) = NULL; + SvREFCNT_dec(obj); } + SvREFCNT_dec(sv); /* undo the inc above */ +} + +/* clear any IO slots in a GV which hold objects; + * called by sv_clean_objs() for each live GV */ + +static void +do_clean_named_io_objs(pTHX_ SV *const sv) +{ + dVAR; + SV *obj; + assert(SvTYPE(sv) == SVt_PVGV); + assert(isGV_with_GP(sv)); + if (!GvGP(sv)) + return; + + SvREFCNT_inc(sv); + if ( ((obj = MUTABLE_SV(GvIO(sv)) )) && SvOBJECT(obj)) { + DEBUG_D((PerlIO_printf(Perl_debug_log, + "Cleaning named glob IO object:\n "), sv_dump(obj))); + GvIOp(sv) = NULL; + SvREFCNT_dec(obj); + } + SvREFCNT_dec(sv); /* undo the inc above */ } #endif @@ -547,8 +561,11 @@ Perl_sv_clean_objs(pTHX) PL_in_clean_objs = TRUE; visit(do_clean_objs, SVf_ROK, SVf_ROK); #ifndef DISABLE_DESTRUCTOR_KLUDGE - /* some barnacles may yet remain, clinging to typeglobs */ + /* Some barnacles may yet remain, clinging to typeglobs. + * Run the non-IO destructors first: they may want to output + * error messages, close files etc */ visit(do_clean_named_objs, SVt_PVGV|SVpgv_GP, SVTYPEMASK|SVp_POK|SVpgv_GP); + visit(do_clean_named_io_objs, SVt_PVGV|SVpgv_GP, SVTYPEMASK|SVp_POK|SVpgv_GP); #endif PL_in_clean_objs = FALSE; } @@ -585,7 +602,6 @@ Perl_sv_clean_all(pTHX) I32 cleaned; PL_in_clean_all = TRUE; cleaned = visit(do_clean_all, 0,0); - PL_in_clean_all = FALSE; return cleaned; } @@ -674,9 +690,6 @@ Perl_sv_free_arenas(pTHX) while (i--) PL_body_roots[i] = 0; - Safefree(PL_nice_chunk); - PL_nice_chunk = NULL; - PL_nice_chunk_size = 0; PL_sv_arenaroot = 0; PL_sv_root = 0; } @@ -705,61 +718,6 @@ Perl_sv_free_arenas(pTHX) are decremented to point at the unused 'ghost' memory, knowing that the pointers are used with offsets to the real memory. - HE, HEK arenas are managed separately, with separate code, but may - be merge-able later.. -*/ - -/* get_arena(size): this creates custom-sized arenas - TBD: export properly for hv.c: S_more_he(). -*/ -void* -Perl_get_arena(pTHX_ const size_t arena_size, const svtype bodytype) -{ - dVAR; - struct arena_desc* adesc; - struct arena_set *aroot = (struct arena_set*) PL_body_arenas; - unsigned int curr; - - /* shouldnt need this - if (!arena_size) arena_size = PERL_ARENA_SIZE; - */ - - /* may need new arena-set to hold new arena */ - if (!aroot || aroot->curr >= aroot->set_size) { - struct arena_set *newroot; - Newxz(newroot, 1, struct arena_set); - newroot->set_size = ARENAS_PER_SET; - newroot->next = aroot; - aroot = newroot; - PL_body_arenas = (void *) newroot; - DEBUG_m(PerlIO_printf(Perl_debug_log, "new arenaset %p\n", (void*)aroot)); - } - - /* ok, now have arena-set with at least 1 empty/available arena-desc */ - curr = aroot->curr++; - adesc = &(aroot->set[curr]); - assert(!adesc->arena); - - Newx(adesc->arena, arena_size, char); - adesc->size = arena_size; - adesc->utype = bodytype; - DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %d added: %p size %"UVuf"\n", - curr, (void*)adesc->arena, (UV)arena_size)); - - return adesc->arena; -} - - -/* return a thing to the free list */ - -#define del_body(thing, root) \ - STMT_START { \ - void ** const thing_copy = (void **)thing;\ - *thing_copy = *root; \ - *root = (void*)thing_copy; \ - } STMT_END - -/* =head1 SV-Body Allocation @@ -806,11 +764,11 @@ they are no longer allocated. In turn, the new_body_* allocators call S_new_body(), which invokes new_body_inline macro, which takes a lock, and takes a body off the -linked list at PL_body_roots[sv_type], calling S_more_bodies() if +linked list at PL_body_roots[sv_type], calling Perl_more_bodies() if necessary to refresh an empty list. Then the lock is released, and the body is returned. -S_more_bodies calls get_arena(), and carves it up into an array of N +Perl_more_bodies allocates a new arena, and carves it up into an array of N bodies, which it strings into a linked list. It looks up arena-size and body-size from the body_details table described below, thus supporting the multiple body-types. @@ -818,10 +776,6 @@ supporting the multiple body-types. If PURIFY is defined, or PERL_ARENA_SIZE=0, arenas are not used, and the (new|del)_X*V macros are mapped directly to malloc/free. -*/ - -/* - For each sv-type, struct body_details bodies_by_type[] carries parameters which control these aspects of SV handling: @@ -899,8 +853,8 @@ struct body_details { + sizeof (((type*)SvANY((const SV *)0))->last_member) static const struct body_details bodies_by_type[] = { - { sizeof(HE), 0, 0, SVt_NULL, - FALSE, NONV, NOARENA, FIT_ARENA(0, sizeof(HE)) }, + /* HEs use this offset for their arena. */ + { 0, 0, 0, SVt_NULL, FALSE, NONV, NOARENA, 0 }, /* The bind placeholder pretends to be an RV for now. Also it's marked as "can't upgrade" to stop anyone using it before it's @@ -920,40 +874,25 @@ static const struct body_details bodies_by_type[] = { SVt_NV, FALSE, HADNV, HASARENA, FIT_ARENA(0, sizeof(NV)) }, /* 8 bytes on most ILP32 with IEEE doubles */ - { sizeof(XPV), + { sizeof(XPV) - STRUCT_OFFSET(XPV, xpv_cur), copy_length(XPV, xpv_len) - STRUCT_OFFSET(XPV, xpv_cur), + STRUCT_OFFSET(XPV, xpv_cur), SVt_PV, FALSE, NONV, HASARENA, FIT_ARENA(0, sizeof(XPV) - STRUCT_OFFSET(XPV, xpv_cur)) }, -#if 2 *PTRSIZE <= IVSIZE /* 12 */ - { sizeof(XPVIV), + { sizeof(XPVIV) - STRUCT_OFFSET(XPV, xpv_cur), copy_length(XPVIV, xiv_u) - STRUCT_OFFSET(XPV, xpv_cur), + STRUCT_OFFSET(XPV, xpv_cur), SVt_PVIV, FALSE, NONV, HASARENA, FIT_ARENA(0, sizeof(XPVIV) - STRUCT_OFFSET(XPV, xpv_cur)) }, - /* 12 */ -#else - { sizeof(XPVIV), - copy_length(XPVIV, xiv_u), - 0, - SVt_PVIV, FALSE, NONV, HASARENA, - FIT_ARENA(0, sizeof(XPVIV)) }, -#endif -#if (2 *PTRSIZE <= IVSIZE) && (2 *PTRSIZE <= NVSIZE) /* 20 */ - { sizeof(XPVNV), + { sizeof(XPVNV) - STRUCT_OFFSET(XPV, xpv_cur), copy_length(XPVNV, xnv_u) - STRUCT_OFFSET(XPV, xpv_cur), + STRUCT_OFFSET(XPV, xpv_cur), SVt_PVNV, FALSE, HADNV, HASARENA, FIT_ARENA(0, sizeof(XPVNV) - STRUCT_OFFSET(XPV, xpv_cur)) }, -#else - /* 20 */ - { sizeof(XPVNV), copy_length(XPVNV, xnv_u), 0, SVt_PVNV, FALSE, HADNV, - HASARENA, FIT_ARENA(0, sizeof(XPVNV)) }, -#endif /* 28 */ { sizeof(XPVMG), copy_length(XPVMG, xnv_u), 0, SVt_PVMG, FALSE, HADNV, @@ -964,7 +903,7 @@ static const struct body_details bodies_by_type[] = { sizeof(regexp), 0, SVt_REGEXP, FALSE, NONV, HASARENA, - FIT_ARENA(0, sizeof(regexp) - STRUCT_OFFSET(regexp, xpv_cur)) + FIT_ARENA(0, sizeof(regexp)) }, /* 48 */ @@ -1012,73 +951,53 @@ static const struct body_details bodies_by_type[] = { (void *)((char *)S_new_body(aTHX_ sv_type) \ - bodies_by_type[sv_type].offset) -#define del_body_allocated(p, sv_type) \ - del_body(p + bodies_by_type[sv_type].offset, &PL_body_roots[sv_type]) - +/* return a thing to the free list */ -#define my_safemalloc(s) (void*)safemalloc(s) -#define my_safecalloc(s) (void*)safecalloc(s, 1) -#define my_safefree(p) safefree((char*)p) +#define del_body(thing, root) \ + STMT_START { \ + void ** const thing_copy = (void **)thing; \ + *thing_copy = *root; \ + *root = (void*)thing_copy; \ + } STMT_END #ifdef PURIFY -#define new_XNV() my_safemalloc(sizeof(XPVNV)) -#define del_XNV(p) my_safefree(p) - -#define new_XPVNV() my_safemalloc(sizeof(XPVNV)) -#define del_XPVNV(p) my_safefree(p) - -#define new_XPVAV() my_safemalloc(sizeof(XPVAV)) -#define del_XPVAV(p) my_safefree(p) +#define new_XNV() safemalloc(sizeof(XPVNV)) +#define new_XPVNV() safemalloc(sizeof(XPVNV)) +#define new_XPVMG() safemalloc(sizeof(XPVMG)) -#define new_XPVHV() my_safemalloc(sizeof(XPVHV)) -#define del_XPVHV(p) my_safefree(p) - -#define new_XPVMG() my_safemalloc(sizeof(XPVMG)) -#define del_XPVMG(p) my_safefree(p) - -#define new_XPVGV() my_safemalloc(sizeof(XPVGV)) -#define del_XPVGV(p) my_safefree(p) +#define del_XPVGV(p) safefree(p) #else /* !PURIFY */ #define new_XNV() new_body_allocated(SVt_NV) -#define del_XNV(p) del_body_allocated(p, SVt_NV) - #define new_XPVNV() new_body_allocated(SVt_PVNV) -#define del_XPVNV(p) del_body_allocated(p, SVt_PVNV) - -#define new_XPVAV() new_body_allocated(SVt_PVAV) -#define del_XPVAV(p) del_body_allocated(p, SVt_PVAV) - -#define new_XPVHV() new_body_allocated(SVt_PVHV) -#define del_XPVHV(p) del_body_allocated(p, SVt_PVHV) - #define new_XPVMG() new_body_allocated(SVt_PVMG) -#define del_XPVMG(p) del_body_allocated(p, SVt_PVMG) -#define new_XPVGV() new_body_allocated(SVt_PVGV) -#define del_XPVGV(p) del_body_allocated(p, SVt_PVGV) +#define del_XPVGV(p) del_body(p + bodies_by_type[SVt_PVGV].offset, \ + &PL_body_roots[SVt_PVGV]) #endif /* PURIFY */ /* no arena for you! */ #define new_NOARENA(details) \ - my_safemalloc((details)->body_size + (details)->offset) + safemalloc((details)->body_size + (details)->offset) #define new_NOARENAZ(details) \ - my_safecalloc((details)->body_size + (details)->offset) + safecalloc((details)->body_size + (details)->offset, 1) -STATIC void * -S_more_bodies (pTHX_ const svtype sv_type) +void * +Perl_more_bodies (pTHX_ const svtype sv_type, const size_t body_size, + const size_t arena_size) { dVAR; void ** const root = &PL_body_roots[sv_type]; - const struct body_details * const bdp = &bodies_by_type[sv_type]; - const size_t body_size = bdp->body_size; + struct arena_desc *adesc; + struct arena_set *aroot = (struct arena_set *) PL_body_arenas; + unsigned int curr; char *start; const char *end; - const size_t arena_size = Perl_malloc_good_size(bdp->arena_size); + const size_t good_arena_size = Perl_malloc_good_size(arena_size); #if defined(DEBUGGING) && !defined(PERL_GLOBAL_STRUCT_PRIVATE) static bool done_sanity_check; @@ -1094,37 +1013,68 @@ S_more_bodies (pTHX_ const svtype sv_type) } #endif - assert(bdp->arena_size); + assert(arena_size); + + /* may need new arena-set to hold new arena */ + if (!aroot || aroot->curr >= aroot->set_size) { + struct arena_set *newroot; + Newxz(newroot, 1, struct arena_set); + newroot->set_size = ARENAS_PER_SET; + newroot->next = aroot; + aroot = newroot; + PL_body_arenas = (void *) newroot; + DEBUG_m(PerlIO_printf(Perl_debug_log, "new arenaset %p\n", (void*)aroot)); + } + + /* ok, now have arena-set with at least 1 empty/available arena-desc */ + curr = aroot->curr++; + adesc = &(aroot->set[curr]); + assert(!adesc->arena); + + Newx(adesc->arena, good_arena_size, char); + adesc->size = good_arena_size; + adesc->utype = sv_type; + DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %d added: %p size %"UVuf"\n", + curr, (void*)adesc->arena, (UV)good_arena_size)); - start = (char*) Perl_get_arena(aTHX_ arena_size, sv_type); + start = (char *) adesc->arena; - end = start + arena_size - 2 * body_size; + /* Get the address of the byte after the end of the last body we can fit. + Remember, this is integer division: */ + end = start + good_arena_size / body_size * body_size; /* computed count doesnt reflect the 1st slot reservation */ #if defined(MYMALLOC) || defined(HAS_MALLOC_GOOD_SIZE) DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %p end %p arena-size %d (from %d) type %d " "size %d ct %d\n", - (void*)start, (void*)end, (int)arena_size, - (int)bdp->arena_size, sv_type, (int)body_size, - (int)arena_size / (int)body_size)); + (void*)start, (void*)end, (int)good_arena_size, + (int)arena_size, sv_type, (int)body_size, + (int)good_arena_size / (int)body_size)); #else DEBUG_m(PerlIO_printf(Perl_debug_log, "arena %p end %p arena-size %d type %d size %d ct %d\n", (void*)start, (void*)end, - (int)bdp->arena_size, sv_type, (int)body_size, - (int)bdp->arena_size / (int)body_size)); + (int)arena_size, sv_type, (int)body_size, + (int)good_arena_size / (int)body_size)); #endif *root = (void *)start; - while (start <= end) { + while (1) { + /* Where the next body would start: */ char * const next = start + body_size; + + if (next >= end) { + /* This is the last body: */ + assert(next == end); + + *(void **)start = 0; + return *root; + } + *(void**) start = (void *)next; start = next; } - *(void **)start = 0; - - return *root; } /* grab a new thing from the free list, allocating more if necessary. @@ -1135,7 +1085,9 @@ S_more_bodies (pTHX_ const svtype sv_type) STMT_START { \ void ** const r3wt = &PL_body_roots[sv_type]; \ xpv = (PTR_TBL_ENT_t*) (*((void **)(r3wt)) \ - ? *((void **)(r3wt)) : more_bodies(sv_type)); \ + ? *((void **)(r3wt)) : Perl_more_bodies(aTHX_ sv_type, \ + bodies_by_type[sv_type].body_size,\ + bodies_by_type[sv_type].arena_size)); \ *(r3wt) = *(void**)(xpv); \ } STMT_END @@ -1445,7 +1397,7 @@ Perl_sv_upgrade(pTHX_ register SV *const sv, svtype new_type) if (old_type > SVt_IV) { #ifdef PURIFY - my_safefree(old_body); + safefree(old_body); #else /* Note that there is an assumption that all bodies of types that can be upgraded came from arenas. Only the more complex non- @@ -1536,6 +1488,10 @@ Perl_sv_grow(pTHX_ register SV *const sv, register STRLEN newlen) s = SvPVX_mutable(sv); if (newlen > SvLEN(sv)) { /* need more room? */ + STRLEN minlen = SvCUR(sv); + minlen += (minlen >> PERL_STRLEN_EXPAND_SHIFT) + 10; + if (newlen < minlen) + newlen = minlen; #ifndef Perl_safesysmalloc_size newlen = PERL_STRLEN_ROUNDUP(newlen); #endif @@ -5242,7 +5198,7 @@ Perl_sv_unmagic(pTHX_ SV *const sv, const int type) const MGVTBL* const vtbl = mg->mg_virtual; *mgp = mg->mg_moremagic; if (vtbl && vtbl->svt_free) - CALL_FPTR(vtbl->svt_free)(aTHX_ sv, mg); + vtbl->svt_free(aTHX_ sv, mg); if (mg->mg_ptr && mg->mg_type != PERL_MAGIC_regex_global) { if (mg->mg_len > 0) Safefree(mg->mg_ptr); @@ -5305,54 +5261,102 @@ Perl_sv_rvweaken(pTHX_ SV *const sv) /* Give tsv backref magic if it hasn't already got it, then push a * back-reference to sv onto the array associated with the backref magic. + * + * As an optimisation, if there's only one backref and it's not an AV, + * store it directly in the HvAUX or mg_obj slot, avoiding the need to + * allocate an AV. (Whether the slot holds an AV tells us whether this is + * active.) + * + * If an HV's backref is stored in magic, it is moved back to HvAUX. */ /* A discussion about the backreferences array and its refcount: * * The AV holding the backreferences is pointed to either as the mg_obj of - * PERL_MAGIC_backref, or in the specific case of a HV, from the - * xhv_backreferences field of the HvAUX structure. The array is created - * with a refcount of 2. This means that if during global destruction the - * array gets picked on before its parent to have its refcount decremented - * by the random zapper, it won't actually be freed, meaning it's still - * there for when its parent gets freed. - * When the parent SV is freed, in the case of magic, the magic is freed, - * Perl_magic_killbackrefs is called which decrements one refcount, then - * mg_obj is freed which kills the second count. - * In the vase of a HV being freed, one ref is removed by S_hfreeentries, - * the other by Perl_sv_kill_backrefs, which it calls. + * PERL_MAGIC_backref, or in the specific case of a HV that has the hv_aux + * structure, from the xhv_backreferences field. (A HV without hv_aux will + * have the standard magic instead.) The array is created with a refcount + * of 2. This means that if during global destruction the array gets + * picked on before its parent to have its refcount decremented by the + * random zapper, it won't actually be freed, meaning it's still there for + * when its parent gets freed. + * + * When the parent SV is freed, the extra ref is killed by + * Perl_sv_kill_backrefs. The other ref is killed, in the case of magic, + * by mg_free() / MGf_REFCOUNTED, or for a hash, by Perl_hv_kill_backrefs. + * + * When a single backref SV is stored directly, it is not reference + * counted. */ void Perl_sv_add_backref(pTHX_ SV *const tsv, SV *const sv) { dVAR; - AV *av; + SV **svp; + AV *av = NULL; + MAGIC *mg = NULL; PERL_ARGS_ASSERT_SV_ADD_BACKREF; - if (SvTYPE(tsv) == SVt_PVHV) { - AV **const avp = Perl_hv_backreferences_p(aTHX_ MUTABLE_HV(tsv)); + /* find slot to store array or singleton backref */ - av = *avp; - if (!av) { - av = newAV(); - AvREAL_off(av); - SvREFCNT_inc_simple_void(av); /* see discussion above */ - *avp = av; + if (SvTYPE(tsv) == SVt_PVHV) { + svp = (SV**)Perl_hv_backreferences_p(aTHX_ MUTABLE_HV(tsv)); + + if (!*svp) { + if ((mg = mg_find(tsv, PERL_MAGIC_backref))) { + /* Aha. They've got it stowed in magic instead. + * Move it back to xhv_backreferences */ + *svp = mg->mg_obj; + /* Stop mg_free decreasing the reference count. */ + mg->mg_obj = NULL; + /* Stop mg_free even calling the destructor, given that + there's no AV to free up. */ + mg->mg_virtual = 0; + sv_unmagic(tsv, PERL_MAGIC_backref); + mg = NULL; + } } } else { - const MAGIC *const mg - = SvMAGICAL(tsv) ? mg_find(tsv, PERL_MAGIC_backref) : NULL; - if (mg) - av = MUTABLE_AV(mg->mg_obj); - else { - av = newAV(); - AvREAL_off(av); - sv_magic(tsv, MUTABLE_SV(av), PERL_MAGIC_backref, NULL, 0); - /* av now has a refcnt of 2; see discussion above */ + if (! ((mg = + (SvMAGICAL(tsv) ? mg_find(tsv, PERL_MAGIC_backref) : NULL)))) + { + sv_magic(tsv, NULL, PERL_MAGIC_backref, NULL, 0); + mg = mg_find(tsv, PERL_MAGIC_backref); } + svp = &(mg->mg_obj); } + + /* create or retrieve the array */ + + if ( (!*svp && SvTYPE(sv) == SVt_PVAV) + || (*svp && SvTYPE(*svp) != SVt_PVAV) + ) { + /* create array */ + av = newAV(); + AvREAL_off(av); + SvREFCNT_inc_simple_void(av); + /* av now has a refcnt of 2; see discussion above */ + if (*svp) { + /* move single existing backref to the array */ + av_extend(av, 1); + AvARRAY(av)[++AvFILLp(av)] = *svp; /* av_push() */ + } + *svp = (SV*)av; + if (mg) + mg->mg_flags |= MGf_REFCOUNTED; + } + else + av = MUTABLE_AV(*svp); + + if (!av) { + /* optimisation: store single backref directly in HvAUX or mg_obj */ + *svp = sv; + return; + } + /* push new backref */ + assert(SvTYPE(av) == SVt_PVAV); if (AvFILLp(av) >= AvMAX(av)) { av_extend(av, AvFILLp(av)+1); } @@ -5367,65 +5371,84 @@ void Perl_sv_del_backref(pTHX_ SV *const tsv, SV *const sv) { dVAR; - AV *av = NULL; - SV **svp; + SV **svp = NULL; I32 i; PERL_ARGS_ASSERT_SV_DEL_BACKREF; - if (SvTYPE(tsv) == SVt_PVHV) { - if (SvOOK(tsv)) { - /* SvOOK: We must avoid creating the hv_aux structure if its - * not already there, as that is stored in the main HvARRAY(), - * and hfreentries assumes that no-one reallocates HvARRAY() - * while it is running. */ - av = *Perl_hv_backreferences_p(aTHX_ MUTABLE_HV(tsv)); - } + if (SvTYPE(tsv) == SVt_PVHV && SvOOK(tsv)) { + svp = (SV**)Perl_hv_backreferences_p(aTHX_ MUTABLE_HV(tsv)); } - else { - const MAGIC *const mg + if (!svp || !*svp) { + MAGIC *const mg = SvMAGICAL(tsv) ? mg_find(tsv, PERL_MAGIC_backref) : NULL; - if (mg) - av = MUTABLE_AV(mg->mg_obj); + svp = mg ? &(mg->mg_obj) : NULL; } - if (!av) + if (!svp || !*svp) Perl_croak(aTHX_ "panic: del_backref"); - assert(!SvIS_FREED(av)); - - svp = AvARRAY(av); - /* We shouldn't be in here more than once, but for paranoia reasons lets - not assume this. */ - for (i = AvFILLp(av); i >= 0; i--) { - if (svp[i] == sv) { - const SSize_t fill = AvFILLp(av); - if (i != fill) { - /* We weren't the last entry. - An unordered list has this property that you can take the - last element off the end to fill the hole, and it's still - an unordered list :-) - */ - svp[i] = svp[fill]; + if (SvTYPE(*svp) == SVt_PVAV) { + int count = 0; + AV * const av = (AV*)*svp; + assert(!SvIS_FREED(av)); + svp = AvARRAY(av); + for (i = AvFILLp(av); i >= 0; i--) { + if (svp[i] == sv) { + const SSize_t fill = AvFILLp(av); + if (i != fill) { + /* We weren't the last entry. + An unordered list has this property that you can take the + last element off the end to fill the hole, and it's still + an unordered list :-) + */ + svp[i] = svp[fill]; + } + svp[fill] = NULL; + AvFILLp(av) = fill - 1; + count++; +#ifndef DEBUGGING + break; /* should only be one */ +#endif } - svp[fill] = NULL; - AvFILLp(av) = fill - 1; } + assert(count == 1); } + else { + /* optimisation: only a single backref, stored directly */ + if (*svp != sv) + Perl_croak(aTHX_ "panic: del_backref"); + *svp = NULL; + } + } -int +void Perl_sv_kill_backrefs(pTHX_ SV *const sv, AV *const av) { - SV **svp = AvARRAY(av); + SV **svp; + SV **last; + bool is_array; PERL_ARGS_ASSERT_SV_KILL_BACKREFS; - PERL_UNUSED_ARG(sv); - if (svp) { - SV *const *const last = svp + AvFILLp(av); + if (!av) + return; + is_array = (SvTYPE(av) == SVt_PVAV); + if (is_array) { assert(!SvIS_FREED(av)); + svp = AvARRAY(av); + if (svp) + last = svp + AvFILLp(av); + } + else { + /* optimisation: only a single backref, stored directly */ + svp = (SV**)&av; + last = svp; + } + + if (svp) { while (svp <= last) { if (*svp) { SV *const referrer = *svp; @@ -5438,29 +5461,45 @@ Perl_sv_kill_backrefs(pTHX_ SV *const sv, AV *const av) SvSETMAGIC(referrer); } else if (SvTYPE(referrer) == SVt_PVGV || SvTYPE(referrer) == SVt_PVLV) { + assert(SvTYPE(sv) == SVt_PVHV); /* stash backref */ /* You lookin' at me? */ assert(GvSTASH(referrer)); assert(GvSTASH(referrer) == (const HV *)sv); GvSTASH(referrer) = 0; - } else if (SvTYPE(referrer) == SVt_PVCV) { - /* You lookin' at me? */ - assert(CvSTASH(referrer)); - assert(CvSTASH(referrer) == (const HV *)sv); - CvSTASH(referrer) = 0; + } else if (SvTYPE(referrer) == SVt_PVCV || + SvTYPE(referrer) == SVt_PVFM) { + if (SvTYPE(sv) == SVt_PVHV) { /* stash backref */ + /* You lookin' at me? */ + assert(CvSTASH(referrer)); + assert(CvSTASH(referrer) == (const HV *)sv); + CvSTASH(referrer) = 0; + } + else { + assert(SvTYPE(sv) == SVt_PVGV); + /* You lookin' at me? */ + assert(CvGV(referrer)); + assert(CvGV(referrer) == (const GV *)sv); + anonymise_cv_maybe(MUTABLE_GV(sv), + MUTABLE_CV(referrer)); + } + } else { Perl_croak(aTHX_ "panic: magic_killbackrefs (flags=%"UVxf")", (UV)SvFLAGS(referrer)); } - *svp = NULL; + if (is_array) + *svp = NULL; } svp++; } + } + if (is_array) { AvFILLp(av) = -1; + SvREFCNT_dec(av); /* remove extra count added by sv_add_backref() */ } - SvREFCNT_dec(av); /* remove extra count added by sv_add_backref() */ - return 0; + return; } /* @@ -5641,6 +5680,45 @@ Perl_sv_replace(pTHX_ register SV *const sv, register SV *const nsv) del_SV(nsv); } +/* We're about to free a GV which has a CV that refers back to us. + * If that CV will outlive us, make it anonymous (i.e. fix up its CvGV + * field) */ + +STATIC void +S_anonymise_cv_maybe(pTHX_ GV *gv, CV* cv) +{ + char *stash; + SV *gvname; + GV *anongv; + + PERL_ARGS_ASSERT_ANONYMISE_CV_MAYBE; + + /* be assertive! */ + assert(SvREFCNT(gv) == 0); + assert(isGV(gv) && isGV_with_GP(gv)); + assert(GvGP(gv)); + assert(!CvANON(cv)); + assert(CvGV(cv) == gv); + + /* will the CV shortly be freed by gp_free() ? */ + if (GvCV(gv) == cv && GvGP(gv)->gp_refcnt < 2 && SvREFCNT(cv) < 2) { + SvANY(cv)->xcv_gv = NULL; + return; + } + + /* if not, anonymise: */ + stash = GvSTASH(gv) ? HvNAME(GvSTASH(gv)) : NULL; + gvname = Perl_newSVpvf(aTHX_ "%s::__ANON__", + stash ? stash : "__ANON__"); + anongv = gv_fetchsv(gvname, GV_ADDMULTI, SVt_PVCV); + SvREFCNT_dec(gvname); + + CvANON_on(cv); + CvCVGV_RC_on(cv); + SvANY(cv)->xcv_gv = MUTABLE_GV(SvREFCNT_inc(anongv)); +} + + /* =for apidoc sv_clear @@ -5780,6 +5858,7 @@ Perl_sv_clear(pTHX_ register SV *const sv) if (PL_last_swash_hv == (const HV *)sv) { PL_last_swash_hv = NULL; } + Perl_hv_kill_backrefs(aTHX_ MUTABLE_HV(sv)); hv_undef(MUTABLE_HV(sv)); break; case SVt_PVAV: @@ -5878,7 +5957,7 @@ Perl_sv_clear(pTHX_ register SV *const sv) &PL_body_roots[type]); } else if (sv_type_details->body_size) { - my_safefree(SvANY(sv)); + safefree(SvANY(sv)); } } @@ -7036,7 +7115,9 @@ Perl_sv_gets(pTHX_ register SV *const sv, register PerlIO *const fp, I32 append) } SvPOK_only(sv); - SvCUR_set(sv,0); + if (!append) { + SvCUR_set(sv,0); + } if (PerlIO_isutf8(fp)) SvUTF8_on(sv); @@ -7744,7 +7825,7 @@ SV is set to 1. Note that if C is zero, Perl will create a zero length string. You are responsible for ensuring that the source string is at least C bytes long. If the C argument is NULL the new SV will be undefined. Currently the only flag bits accepted are C and C. -If C is set, then C is called on the result before +If C is set, then C is called on the result before returning. If C is set, C is considered to be in UTF-8 and the C flag will be set on the new SV. C is a convenience wrapper for this function, defined as @@ -8623,7 +8704,7 @@ Perl_sv_reftype(pTHX_ const SV *const sv, const int ob) case SVt_PVFM: return "FORMAT"; case SVt_PVIO: return "IO"; case SVt_BIND: return "BIND"; - case SVt_REGEXP: return "REGEXP"; + case SVt_REGEXP: return "REGEXP"; default: return "UNKNOWN"; } } @@ -10566,9 +10647,6 @@ Perl_parser_dup(pTHX_ const yy_parser *const proto, CLONE_PARAMS *const param) Newxz(parser, 1, yy_parser); ptr_table_store(PL_ptr_table, proto, parser); - parser->yyerrstatus = 0; - parser->yychar = YYEMPTY; /* Cause a token to be read. */ - /* XXX these not yet duped */ parser->old_parser = NULL; parser->stack = NULL; @@ -10752,6 +10830,13 @@ Perl_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *const param) for (; mg; mg = mg->mg_moremagic) { MAGIC *nmg; + + if ((param->flags & CLONEf_JOIN_IN) + && mg->mg_type == PERL_MAGIC_backref) + /* when joining, we let the individual SVs add themselves to + * backref as needed. */ + continue; + Newx(nmg, 1, MAGIC); *mgprev_p = nmg; mgprev_p = &(nmg->mg_moremagic); @@ -10769,17 +10854,14 @@ Perl_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *const param) } else */ - if(nmg->mg_type == PERL_MAGIC_backref) { - /* The backref AV has its reference count deliberately bumped by - 1. */ - nmg->mg_obj - = SvREFCNT_inc(av_dup_inc((const AV *) nmg->mg_obj, param)); - } - else { - nmg->mg_obj = (nmg->mg_flags & MGf_REFCOUNTED) - ? sv_dup_inc(nmg->mg_obj, param) - : sv_dup(nmg->mg_obj, param); - } + nmg->mg_obj = (nmg->mg_flags & MGf_REFCOUNTED) + ? nmg->mg_type == PERL_MAGIC_backref + /* The backref AV has its reference + * count deliberately bumped by 1 */ + ? SvREFCNT_inc(av_dup_inc((const AV *) + nmg->mg_obj, param)) + : sv_dup_inc(nmg->mg_obj, param) + : sv_dup(nmg->mg_obj, param); if (nmg->mg_ptr && nmg->mg_type != PERL_MAGIC_regex_global) { if (nmg->mg_len > 0) { @@ -10796,7 +10878,7 @@ Perl_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *const param) nmg->mg_ptr = (char*)sv_dup_inc((const SV *)nmg->mg_ptr, param); } if ((nmg->mg_flags & MGf_DUP) && nmg->mg_virtual && nmg->mg_virtual->svt_dup) { - CALL_FPTR(nmg->mg_virtual->svt_dup)(aTHX_ nmg, param); + nmg->mg_virtual->svt_dup(aTHX_ nmg, param); } } return mgret; @@ -10991,10 +11073,16 @@ Perl_rvpv_dup(pTHX_ SV *const dstr, const SV *const sstr, CLONE_PARAMS *const pa PERL_ARGS_ASSERT_RVPV_DUP; if (SvROK(sstr)) { - SvRV_set(dstr, SvWEAKREF(sstr) - ? sv_dup(SvRV_const(sstr), param) - : sv_dup_inc(SvRV_const(sstr), param)); - + if (SvWEAKREF(sstr)) { + SvRV_set(dstr, sv_dup(SvRV_const(sstr), param)); + if (param->flags & CLONEf_JOIN_IN) { + /* if joining, we add any back references individually rather + * than copying the whole backref array */ + Perl_sv_add_backref(aTHX_ SvRV(dstr), dstr); + } + } + else + SvRV_set(dstr, sv_dup_inc(SvRV_const(sstr), param)); } else if (SvPVX_const(sstr)) { /* Has something there */ @@ -11071,9 +11159,12 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) something that is bad **/ if (SvTYPE(sstr) == SVt_PVHV) { const HEK * const hvname = HvNAME_HEK(sstr); - if (hvname) + if (hvname) { /** don't clone stashes if they already exist **/ - return MUTABLE_SV(gv_stashpvn(HEK_KEY(hvname), HEK_LEN(hvname), 0)); + dstr = MUTABLE_SV(gv_stashpvn(HEK_KEY(hvname), HEK_LEN(hvname), 0)); + ptr_table_store(PL_ptr_table, sstr, dstr); + return dstr; + } } } @@ -11084,7 +11175,7 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) dstr->sv_debug_optype = sstr->sv_debug_optype; dstr->sv_debug_line = sstr->sv_debug_line; dstr->sv_debug_inpad = sstr->sv_debug_inpad; - dstr->sv_debug_cloned = 1; + dstr->sv_debug_parent = (SV*)sstr; dstr->sv_debug_file = savepv(sstr->sv_debug_file); #endif @@ -11213,6 +11304,7 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) else LvTARG(dstr) = sv_dup_inc(LvTARG(dstr), param); case SVt_PVGV: + /* non-GP case already handled above */ if(isGV_with_GP(sstr)) { GvNAME_HEK(dstr) = hek_dup(GvNAME_HEK(dstr), param); /* Don't call sv_add_backref here as it's going to be @@ -11222,22 +11314,11 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) /* Danger Will Robinson - GvGP(dstr) isn't initialised at the point of this comment. */ GvSTASH(dstr) = hv_dup(GvSTASH(dstr), param); - if(param->flags & CLONEf_JOIN_IN) { - const HEK * const hvname - = HvNAME_HEK(GvSTASH(dstr)); - if( hvname - && GvSTASH(dstr) == gv_stashpvn( - HEK_KEY(hvname), HEK_LEN(hvname), 0 - ) - ) - Perl_sv_add_backref( - aTHX_ MUTABLE_SV(GvSTASH(dstr)), dstr - ); - } + if (param->flags & CLONEf_JOIN_IN) + Perl_sv_add_backref(aTHX_ MUTABLE_SV(GvSTASH(dstr)), dstr); GvGP(dstr) = gp_dup(GvGP(sstr), param); (void)GpREFCNT_inc(GvGP(dstr)); - } else - Perl_rvpv_dup(aTHX_ dstr, sstr, param); + } break; case SVt_PVIO: /* PL_parser->rsfp_filters entries have fake IoDIRP() */ @@ -11333,9 +11414,22 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) cBOOL(HvSHAREKEYS(sstr)), param) : 0; /* backref array needs refcnt=2; see sv_add_backref */ daux->xhv_backreferences = - saux->xhv_backreferences - ? MUTABLE_AV(SvREFCNT_inc( - sv_dup_inc((const SV *)saux->xhv_backreferences, param))) + (param->flags & CLONEf_JOIN_IN) + /* when joining, we let the individual GVs and + * CVs add themselves to backref as + * needed. This avoids pulling in stuff + * that isn't required, and simplifies the + * case where stashes aren't cloned back + * if they already exist in the parent + * thread */ + ? NULL + : saux->xhv_backreferences + ? (SvTYPE(saux->xhv_backreferences) == SVt_PVAV) + ? MUTABLE_AV(SvREFCNT_inc( + sv_dup_inc((const SV *) + saux->xhv_backreferences, param))) + : MUTABLE_AV(sv_dup((const SV *) + saux->xhv_backreferences, param)) : 0; daux->xhv_mro_meta = saux->xhv_mro_meta @@ -11358,18 +11452,8 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) case SVt_PVFM: /* NOTE: not refcounted */ CvSTASH(dstr) = hv_dup(CvSTASH(dstr), param); - if(param->flags & CLONEf_JOIN_IN && CvSTASH(dstr)) { - const HEK * const hvname - = HvNAME_HEK(CvSTASH(dstr)); - if( hvname - && CvSTASH(dstr) == gv_stashpvn( - HEK_KEY(hvname), HEK_LEN(hvname), 0 - ) - ) - Perl_sv_add_backref( - aTHX_ MUTABLE_SV(CvSTASH(dstr)), dstr - ); - } + if ((param->flags & CLONEf_JOIN_IN) && CvSTASH(dstr)) + Perl_sv_add_backref(aTHX_ MUTABLE_SV(CvSTASH(dstr)), dstr); OP_REFCNT_LOCK; if (!CvISXSUB(dstr)) CvROOT(dstr) = OpREFCNT_inc(CvROOT(dstr)); @@ -11380,8 +11464,13 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) } /* don't dup if copying back - CvGV isn't refcounted, so the * duped GV may never be freed. A bit of a hack! DAPM */ - CvGV(dstr) = (param->flags & CLONEf_JOIN_IN) ? - NULL : gv_dup(CvGV(dstr), param) ; + SvANY(MUTABLE_CV(dstr))->xcv_gv = + CvCVGV_RC(dstr) + ? gv_dup_inc(CvGV(sstr), param) + : (param->flags & CLONEf_JOIN_IN) + ? NULL + : gv_dup(CvGV(sstr), param); + CvPADLIST(dstr) = padlist_dup(CvPADLIST(sstr), param); CvOUTSIDE(dstr) = CvWEAKOUTSIDE(sstr) @@ -11497,13 +11586,13 @@ Perl_cx_dup(pTHX_ PERL_CONTEXT *cxs, I32 ix, I32 max, CLONE_PARAMS* param) case CXt_LOOP_LAZYIV: case CXt_LOOP_PLAIN: if (CxPADLOOP(ncx)) { - ncx->blk_loop.oldcomppad + ncx->blk_loop.itervar_u.oldcomppad = (PAD*)ptr_table_fetch(PL_ptr_table, - ncx->blk_loop.oldcomppad); + ncx->blk_loop.itervar_u.oldcomppad); } else { - ncx->blk_loop.oldcomppad - = (PAD*)gv_dup((const GV *)ncx->blk_loop.oldcomppad, - param); + ncx->blk_loop.itervar_u.gv + = gv_dup((const GV *)ncx->blk_loop.itervar_u.gv, + param); } break; case CXt_FORMAT: @@ -11647,6 +11736,7 @@ Perl_ss_dup(pTHX_ PerlInterpreter *proto_perl, CLONE_PARAMS* param) TOPPTR(nss,ix) = sv_dup_inc(sv, param); /* fall through */ case SAVEt_ITEM: /* normal string */ + case SAVEt_GVSV: /* scalar slot in GV */ case SAVEt_SV: /* scalar reference */ sv = (const SV *)POPPTR(ss,ix); TOPPTR(nss,ix) = sv_dup_inc(sv, param); @@ -12069,7 +12159,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_parser = NULL; Zero(&PL_debug_pad, 1, struct perl_debug_pad); # ifdef DEBUG_LEAKING_SCALARS - PL_sv_serial = (((U32)my_perl >> 2) & 0xfff) * 1000000; + PL_sv_serial = (((UV)my_perl >> 2) & 0xfff) * 1000000; # endif #else /* !DEBUGGING */ Zero(my_perl, 1, PerlInterpreter); @@ -12102,8 +12192,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_body_arenas = NULL; Zero(&PL_body_roots, 1, PL_body_roots); - PL_nice_chunk = NULL; - PL_nice_chunk_size = 0; PL_sv_count = 0; PL_sv_objcount = 0; PL_sv_root = NULL; @@ -12220,6 +12308,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, /* switches */ PL_minus_c = proto_perl->Iminus_c; PL_patchlevel = sv_dup_inc(proto_perl->Ipatchlevel, param); + PL_apiversion = sv_dup_inc(proto_perl->Iapiversion, param); PL_localpatches = proto_perl->Ilocalpatches; PL_splitstr = proto_perl->Isplitstr; PL_minus_n = proto_perl->Iminus_n; @@ -12272,7 +12361,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, PL_regex_pad = AvARRAY(PL_regex_padav); /* shortcuts to various I/O objects */ - PL_ofsgv = gv_dup(proto_perl->Iofsgv, param); + PL_ofsgv = gv_dup_inc(proto_perl->Iofsgv, param); PL_stdingv = gv_dup(proto_perl->Istdingv, param); PL_stderrgv = gv_dup(proto_perl->Istderrgv, param); PL_defgv = gv_dup(proto_perl->Idefgv, param); @@ -12661,6 +12750,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, /* Pluggable optimizer */ PL_peepp = proto_perl->Ipeepp; + PL_rpeepp = proto_perl->Irpeepp; /* op_free() hook */ PL_opfreehook = proto_perl->Iopfreehook; @@ -12765,9 +12855,11 @@ S_unreferenced_to_tmp_stack(pTHX_ AV *const unreferenced) void Perl_clone_params_del(CLONE_PARAMS *param) { - PerlInterpreter *const was = PERL_GET_THX; + /* This seemingly funky ordering keeps the build with PERL_GLOBAL_STRUCT + happy: */ PerlInterpreter *const to = param->new_perl; dTHXa(to); + PerlInterpreter *const was = PERL_GET_THX; PERL_ARGS_ASSERT_CLONE_PARAMS_DEL; @@ -12789,6 +12881,7 @@ Perl_clone_params_del(CLONE_PARAMS *param) CLONE_PARAMS * Perl_clone_params_new(PerlInterpreter *const from, PerlInterpreter *const to) { + dVAR; /* Need to play this game, as newAV() can call safesysmalloc(), and that does a dTHX; to get the context from thread local storage. FIXME - under PERL_CORE Newx(), Safefree() and friends should expand to