X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/df5f182b2f0708f51f91b8d390f65db1df18e143..d0c0e7dd0ccf3d5c2f658529d3ee578a0bcb116e:/mro.c diff --git a/mro.c b/mro.c index 7506994..1d60387 100644 --- a/mro.c +++ b/mro.c @@ -216,7 +216,7 @@ S_mro_get_linear_isa_dfs(pTHX_ HV *stash, U32 level) assert(HvAUX(stash)); stashhek - = HvAUX(stash)->xhv_name && HvENAME_HEK_NN(stash) + = HvAUX(stash)->xhv_name_u.xhvnameu_name && HvENAME_HEK_NN(stash) ? HvENAME_HEK_NN(stash) : HvNAME_HEK(stash); @@ -224,8 +224,9 @@ S_mro_get_linear_isa_dfs(pTHX_ HV *stash, U32 level) Perl_croak(aTHX_ "Can't linearize anonymous symbol table"); if (level > 100) - Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'", - HEK_KEY(stashhek)); + Perl_croak(aTHX_ + "Recursive inheritance detected in package '%"HEKf"'", + HEKfARG(stashhek)); meta = HvMROMETA(stash); @@ -379,10 +380,9 @@ S_mro_get_linear_isa_dfs(pTHX_ HV *stash, U32 level) /* =for apidoc mro_get_linear_isa -Returns either C or -C for the given stash, -dependant upon which MRO is in effect -for that stash. The return value is a +Returns the mro linearisation for the given stash. By default, this +will be whatever C returns unless some +other MRO is in effect for the stash. The return value is a read-only AV*. You are responsible for C on the @@ -441,22 +441,24 @@ Takes the necessary steps (cache invalidations, mostly) when the @ISA of the given package has changed. Invoked by the C magic, should not need to invoke directly. -=for apidoc mro_isa_changed_in3 - -Takes the necessary steps (cache invalidations, mostly) -when the @ISA of the given package has changed. Invoked -by the C magic, should not need to invoke directly. - -The stash can be passed as the first argument, or its name and length as -the second and third (or both). If just the name is passed and the stash -does not exist, then only the subclasses' method and isa caches will be -invalidated. - =cut */ + +/* Macro to avoid repeating the code five times. */ +#define CLEAR_LINEAR(mEta) \ + if (mEta->mro_linear_all) { \ + SvREFCNT_dec(MUTABLE_SV(mEta->mro_linear_all)); \ + mEta->mro_linear_all = NULL; \ + /* This is just acting as a shortcut pointer. */ \ + mEta->mro_linear_current = NULL; \ + } else if (mEta->mro_linear_current) { \ + /* Only the current MRO is stored, so this owns the data. */ \ + SvREFCNT_dec(mEta->mro_linear_current); \ + mEta->mro_linear_current = NULL; \ + } + void -Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, - STRLEN stashname_len) +Perl_mro_isa_changed_in(pTHX_ HV* stash) { dVAR; HV* isarev; @@ -465,46 +467,36 @@ Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, SV** svp; I32 items; bool is_universal; - struct mro_meta * meta = NULL; + struct mro_meta * meta; HV *isa = NULL; - if(!stashname && stash) { - stashname = HvENAME_get(stash); - stashname_len = HvENAMELEN_get(stash); - } - else if(!stash) - stash = gv_stashpvn(stashname, stashname_len, 0 /* don't add */); + const char * const stashname = HvENAME_get(stash); + const STRLEN stashname_len = HvENAMELEN_get(stash); + const bool stashname_utf8 = HvENAMEUTF8(stash) ? 1 : 0; + + PERL_ARGS_ASSERT_MRO_ISA_CHANGED_IN; if(!stashname) Perl_croak(aTHX_ "Can't call mro_isa_changed_in() on anonymous symbol table"); - if(stash) { - /* wipe out the cached linearizations for this stash */ - meta = HvMROMETA(stash); - if (meta->mro_linear_all) { - SvREFCNT_dec(MUTABLE_SV(meta->mro_linear_all)); - meta->mro_linear_all = NULL; - /* This is just acting as a shortcut pointer. */ - meta->mro_linear_current = NULL; - } else if (meta->mro_linear_current) { - /* Only the current MRO is stored, so this owns the data. */ - SvREFCNT_dec(meta->mro_linear_current); - meta->mro_linear_current = NULL; - } - if (meta->isa) { + + /* wipe out the cached linearizations for this stash */ + meta = HvMROMETA(stash); + CLEAR_LINEAR(meta); + if (meta->isa) { /* Steal it for our own purposes. */ isa = (HV *)sv_2mortal((SV *)meta->isa); meta->isa = NULL; - } - - /* Inc the package generation, since our @ISA changed */ - meta->pkg_gen++; } + /* Inc the package generation, since our @ISA changed */ + meta->pkg_gen++; + /* Wipe the global method cache if this package is UNIVERSAL or one of its parents */ - svp = hv_fetch(PL_isarev, stashname, stashname_len, 0); + svp = hv_fetch(PL_isarev, stashname, + stashname_utf8 ? -(I32)stashname_len : (I32)stashname_len, 0); isarev = svp ? MUTABLE_HV(*svp) : NULL; if((stashname_len == 9 && strEQ(stashname, "UNIVERSAL")) @@ -513,12 +505,12 @@ Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, is_universal = TRUE; } else { /* Wipe the local method cache otherwise */ - if(meta) meta->cache_gen++; + meta->cache_gen++; is_universal = FALSE; } /* wipe next::method cache too */ - if(meta && meta->mro_nextmethod) hv_clear(meta->mro_nextmethod); + if(meta->mro_nextmethod) hv_clear(meta->mro_nextmethod); /* Iterate the isarev (classes that are our children), wiping out their linearization, method and isa caches @@ -541,23 +533,12 @@ Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, isa_hashes = (HV *)sv_2mortal((SV *)newHV()); } while((iter = hv_iternext(isarev))) { - I32 len; - const char* const revkey = hv_iterkey(iter, &len); - HV* revstash = gv_stashpvn(revkey, len, 0); + HV* revstash = gv_stashsv(hv_iterkeysv(iter), 0); struct mro_meta* revmeta; if(!revstash) continue; revmeta = HvMROMETA(revstash); - if (revmeta->mro_linear_all) { - SvREFCNT_dec(MUTABLE_SV(revmeta->mro_linear_all)); - revmeta->mro_linear_all = NULL; - /* This is just acting as a shortcut pointer. */ - revmeta->mro_linear_current = NULL; - } else if (revmeta->mro_linear_current) { - /* Only the current MRO is stored, so this owns the data. */ - SvREFCNT_dec(revmeta->mro_linear_current); - revmeta->mro_linear_current = NULL; - } + CLEAR_LINEAR(revmeta); if(!is_universal) revmeta->cache_gen++; if(revmeta->mro_nextmethod) @@ -585,11 +566,6 @@ Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, HV * const isa = (HV *)HeVAL(iter); const HEK *namehek; - /* Re-calculate the linearisation, unless a previous iter- - ation was for a subclass of this class. */ - if(!HvMROMETA(revstash)->isa) - (void)mro_get_linear_isa(revstash); - /* We're starting at the 2nd element, skipping revstash */ linear_mro = mro_get_linear_isa(revstash); svp = AvARRAY(linear_mro) + 1; @@ -620,7 +596,8 @@ Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, (void) hv_store( - mroisarev, HEK_KEY(namehek), HEK_LEN(namehek), + mroisarev, HEK_KEY(namehek), + HEK_UTF8(namehek) ? -HEK_LEN(namehek) : HEK_LEN(namehek), &PL_sv_yes, 0 ); } @@ -628,20 +605,16 @@ Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, if((SV *)isa != &PL_sv_undef) mro_clean_isarev( isa, HEK_KEY(namehek), HEK_LEN(namehek), - HvMROMETA(revstash)->isa + HvMROMETA(revstash)->isa, (HEK_UTF8(namehek) ? SVf_UTF8 : 0) ); } } } - /* Now iterate our MRO (parents), and: - 1) Add ourselves and everything from our isarev to their isarev - 2) Delete the parent’s entry from the (now temporary) isa hash + /* Now iterate our MRO (parents), adding ourselves and everything from + our isarev to their isarev. */ - /* This only applies if the stash exists. */ - if(!stash) goto clean_up_isarev; - /* We're starting at the 2nd element, skipping ourselves here */ linear_mro = mro_get_linear_isa(stash); svp = AvARRAY(linear_mro) + 1; @@ -666,19 +639,20 @@ Perl_mro_isa_changed_in3(pTHX_ HV* stash, const char *stashname, save time by not making two calls to the common HV code for the case where it doesn't exist. */ - (void)hv_store(mroisarev, stashname, stashname_len, &PL_sv_yes, 0); + (void)hv_store(mroisarev, stashname, + stashname_utf8 ? -(I32)stashname_len : (I32)stashname_len, &PL_sv_yes, 0); } - clean_up_isarev: /* Delete our name from our former parents’ isarevs. */ if(isa && HvARRAY(isa)) - mro_clean_isarev(isa, stashname, stashname_len, meta->isa); + mro_clean_isarev(isa, stashname, stashname_len, meta->isa, + (stashname_utf8 ? SVf_UTF8 : 0) ); } /* Deletes name from all the isarev entries listed in isa */ STATIC void S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, - const STRLEN len, HV * const exceptions) + const STRLEN len, HV * const exceptions, U32 flags) { HE* iter; @@ -690,13 +664,15 @@ S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, while((iter = hv_iternext(isa))) { I32 klen; const char * const key = hv_iterkey(iter, &klen); - if(exceptions && hv_exists(exceptions, key, klen)) continue; - svp = hv_fetch(PL_isarev, key, klen, 0); + if(exceptions && hv_exists(exceptions, key, HeKUTF8(iter) ? -klen : klen)) + continue; + svp = hv_fetch(PL_isarev, key, HeKUTF8(iter) ? -klen : klen, 0); if(svp) { HV * const isarev = (HV *)*svp; - (void)hv_delete(isarev, name, len, G_DISCARD); - if(!HvARRAY(isarev) || !HvKEYS(isarev)) - (void)hv_delete(PL_isarev, key, klen, G_DISCARD); + (void)hv_delete(isarev, name, (flags & SVf_UTF8) ? -(I32)len : (I32)len, G_DISCARD); + if(!HvARRAY(isarev) || !HvUSEDKEYS(isarev)) + (void)hv_delete(PL_isarev, key, + HeKUTF8(iter) ? -klen : klen, G_DISCARD); } } } @@ -708,9 +684,7 @@ S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, Call this function to signal to a stash that it has been assigned to another spot in the stash hierarchy. C is the stash that has been assigned. C is the stash it replaces, if any. C is the glob -that is actually being assigned to. C and C are the -full name of the GV. If these last two arguments are omitted, they can be -inferred from C. C can be omitted if C is given. +that is actually being assigned to. This can also be called with a null first argument to indicate that C has been deleted. @@ -722,20 +696,25 @@ non-existent packages that have corresponding entries in C. It also sets the effective names (C) on all the stashes as appropriate. +If the C is present and is not in the symbol table, then this function +simply returns. This checked will be skipped if C. + =cut */ void Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, - const GV *gv, const char *newname, - I32 newname_len) + const GV * const gv, U32 flags) { + SV *namesv; + HEK **namep; + I32 name_count; HV *stashes; HE* iter; + PERL_ARGS_ASSERT_MRO_PACKAGE_MOVED; assert(stash || oldstash); - assert(gv || newname); - /* Determine the name of the location that stash was assigned to + /* Determine the name(s) of the location that stash was assigned to * or from which oldstash was removed. * * We cannot reliably use the name in oldstash, because it may have @@ -748,19 +727,79 @@ Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, * *$globref = *frelp::; * # calls mro_package_moved(%frelp::, %baz::, *$globref, NULL, 0) * - * If newname is not null, then we trust that the caller gave us the - * right name. Otherwise, we get it from the gv. But if the gv is not - * in the symbol table, then we just return. + * So we get it from the gv. But, since the gv may no longer be in the + * symbol table, we check that first. The only reliable way to tell is + * to see whether its stash has an effective name and whether the gv + * resides in that stash under its name. That effective name may be + * different from what gv_fullname4 would use. + * If flags & 1, the caller has asked us to skip the check. */ - if(!newname && gv) { - SV * const namesv = sv_newmortal(); - STRLEN len; - gv_fullname4(namesv, gv, NULL, 0); - if(gv_fetchsv(namesv, GV_NOADD_NOINIT, SVt_PVGV) != gv) return; - newname = SvPV_const(namesv, len); - newname_len = len - 2; /* skip trailing :: */ + if(!(flags & 1)) { + SV **svp; + if( + !GvSTASH(gv) || !HvENAME(GvSTASH(gv)) || + !(svp = hv_fetch(GvSTASH(gv), GvNAME(gv), + GvNAMEUTF8(gv) ? -GvNAMELEN(gv) : GvNAMELEN(gv), 0)) || + *svp != (SV *)gv + ) return; + } + assert(SvOOK(GvSTASH(gv))); + assert(GvNAMELEN(gv)); + assert(GvNAME(gv)[GvNAMELEN(gv) - 1] == ':'); + assert(GvNAMELEN(gv) == 1 || GvNAME(gv)[GvNAMELEN(gv) - 2] == ':'); + name_count = HvAUX(GvSTASH(gv))->xhv_name_count; + if (!name_count) { + name_count = 1; + namep = &HvAUX(GvSTASH(gv))->xhv_name_u.xhvnameu_name; + } + else { + namep = HvAUX(GvSTASH(gv))->xhv_name_u.xhvnameu_names; + if (name_count < 0) ++namep, name_count = -name_count - 1; + } + if (name_count == 1) { + if (HEK_LEN(*namep) == 4 && strnEQ(HEK_KEY(*namep), "main", 4)) { + namesv = GvNAMELEN(gv) == 1 + ? newSVpvs_flags(":", SVs_TEMP) + : newSVpvs_flags("", SVs_TEMP); + } + else { + namesv = sv_2mortal(newSVhek(*namep)); + if (GvNAMELEN(gv) == 1) sv_catpvs(namesv, ":"); + else sv_catpvs(namesv, "::"); + } + if (GvNAMELEN(gv) != 1) { + sv_catpvn_flags( + namesv, GvNAME(gv), GvNAMELEN(gv) - 2, + /* skip trailing :: */ + GvNAMEUTF8(gv) ? SV_CATUTF8 : SV_CATBYTES + ); + } + } + else { + SV *aname; + namesv = sv_2mortal((SV *)newAV()); + while (name_count--) { + if(HEK_LEN(*namep) == 4 && strnEQ(HEK_KEY(*namep), "main", 4)){ + aname = GvNAMELEN(gv) == 1 + ? newSVpvs(":") + : newSVpvs(""); + namep++; + } + else { + aname = newSVhek(*namep++); + if (GvNAMELEN(gv) == 1) sv_catpvs(aname, ":"); + else sv_catpvs(aname, "::"); + } + if (GvNAMELEN(gv) != 1) { + sv_catpvn_flags( + aname, GvNAME(gv), GvNAMELEN(gv) - 2, + /* skip trailing :: */ + GvNAMEUTF8(gv) ? SV_CATUTF8 : SV_CATBYTES + ); + } + av_push((AV *)namesv, aname); + } } - if(newname_len < 0) newname_len = -newname_len; /* Get a list of all the affected classes. */ /* We cannot simply pass them all to mro_isa_changed_in to avoid @@ -773,107 +812,160 @@ Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, as neither B nor B::B can be updated before the other, since they will reset caches on foo, which will see either B or B::B with the wrong name. The names must be set on *all* affected stashes before - we do anything else. + we do anything else. (And linearisations must be cleared, too.) */ stashes = (HV *) sv_2mortal((SV *)newHV()); - mro_gather_and_rename(stashes, stash, oldstash, newname, newname_len); - - /* Iterate through the stashes, wiping isa linearisations, but leaving - the isa hash (which mro_isa_changed_in needs for adjusting the - isarev hashes belonging to parent classes). */ - hv_iterinit(stashes); - while((iter = hv_iternext(stashes))) { - if(HeVAL(iter) != &PL_sv_yes && HvENAME(HeVAL(iter))) { - struct mro_meta* meta; - meta = HvMROMETA((HV *)HeVAL(iter)); - if (meta->mro_linear_all) { - SvREFCNT_dec(MUTABLE_SV(meta->mro_linear_all)); - meta->mro_linear_all = NULL; - /* This is just acting as a shortcut pointer. */ - meta->mro_linear_current = NULL; - } else if (meta->mro_linear_current) { - /* Only the current MRO is stored, so this owns the data. */ - SvREFCNT_dec(meta->mro_linear_current); - meta->mro_linear_current = NULL; - } - } - } + mro_gather_and_rename( + stashes, (HV *) sv_2mortal((SV *)newHV()), + stash, oldstash, namesv + ); /* Once the caches have been wiped on all the classes, call mro_isa_changed_in on each. */ hv_iterinit(stashes); while((iter = hv_iternext(stashes))) { - if(HeVAL(iter) != &PL_sv_yes && HvENAME(HeVAL(iter))) - mro_isa_changed_in((HV *)HeVAL(iter)); - /* We are not holding a refcount, so eliminate the pointer before - * stashes is freed. */ - HeVAL(iter) = NULL; + HV * const stash = *(HV **)HEK_KEY(HeKEY_hek(iter)); + if(HvENAME(stash)) { + /* We have to restore the original meta->isa (that + mro_gather_and_rename set aside for us) this way, in case + one class in this list is a superclass of a another class + that we have already encountered. In such a case, meta->isa + will have been overwritten without old entries being deleted + from PL_isarev. */ + struct mro_meta * const meta = HvMROMETA(stash); + if(meta->isa != (HV *)HeVAL(iter)){ + SvREFCNT_dec(meta->isa); + meta->isa + = HeVAL(iter) == &PL_sv_yes + ? NULL + : (HV *)HeVAL(iter); + HeVAL(iter) = NULL; /* We donated our reference count. */ + } + mro_isa_changed_in(stash); + } } } void -S_mro_gather_and_rename(pTHX_ HV * const stashes, HV *stash, HV *oldstash, - const char *name, I32 namlen) +S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, + HV *stash, HV *oldstash, SV *namesv) { register XPVHV* xhv; register HE *entry; I32 riter = -1; + I32 items = 0; const bool stash_had_name = stash && HvENAME(stash); + bool fetched_isarev = FALSE; HV *seen = NULL; HV *isarev = NULL; - SV **svp; + SV **svp = NULL; PERL_ARGS_ASSERT_MRO_GATHER_AND_RENAME; + /* We use the seen_stashes hash to keep track of which packages have + been encountered so far. This must be separate from the main list of + stashes, as we need to distinguish between stashes being assigned + and stashes being replaced/deleted. (A nested stash can be on both + sides of an assignment. We cannot simply skip iterating through a + stash on the right if we have seen it on the left, as it will not + get its ename assigned to it.) + + To avoid allocating extra SVs, instead of a bitfield we can make + bizarre use of immortals: + + &PL_sv_undef: seen on the left (oldstash) + &PL_sv_no : seen on the right (stash) + &PL_sv_yes : seen on both sides + + */ + if(oldstash) { /* Add to the big list. */ + struct mro_meta * meta; HE * const entry = (HE *) hv_common( - stashes, NULL, (const char *)&oldstash, sizeof(HV *), 0, + seen_stashes, NULL, (const char *)&oldstash, sizeof(HV *), 0, HV_FETCH_LVALUE|HV_FETCH_EMPTY_HE, NULL, 0 ); - if(HeVAL(entry) == (SV *)oldstash) { + if(HeVAL(entry) == &PL_sv_undef || HeVAL(entry) == &PL_sv_yes) { oldstash = NULL; goto check_stash; } - HeVAL(entry) = (SV *)oldstash; + HeVAL(entry) + = HeVAL(entry) == &PL_sv_no ? &PL_sv_yes : &PL_sv_undef; + meta = HvMROMETA(oldstash); + (void) + hv_store( + stashes, (const char *)&oldstash, sizeof(HV *), + meta->isa + ? SvREFCNT_inc_simple_NN((SV *)meta->isa) + : &PL_sv_yes, + 0 + ); + CLEAR_LINEAR(meta); /* Update the effective name. */ if(HvENAME_get(oldstash)) { - const HEK * const enamehek = HvENAME_HEK(oldstash); - if(PL_stashcache) - (void) - hv_delete(PL_stashcache, name, namlen, G_DISCARD); - hv_ename_delete(oldstash, name, namlen); - - /* If the name deletion caused a name change, then we are not - * going to call mro_isa_changed_in with this name (and not at all - * if it has become anonymous) so we need to delete old isarev - * entries here, both those in the superclasses and this class’s - * own list of subclasses. We simply delete the latter from - * from PL_isarev, since we still need it. hv_delete mortifies it - * for us, so sv_2mortal is not necessary. */ - if(HvENAME_HEK(oldstash) != enamehek) { - const struct mro_meta * meta = HvMROMETA(oldstash); - if(meta->isa && HvARRAY(meta->isa)) - mro_clean_isarev(meta->isa, name, namlen, NULL); - isarev = (HV *)hv_delete(PL_isarev, name, namlen, 0); - } + const HEK * const enamehek = HvENAME_HEK(oldstash); + if(SvTYPE(namesv) == SVt_PVAV) { + items = AvFILLp((AV *)namesv) + 1; + svp = AvARRAY((AV *)namesv); + } + else { + items = 1; + svp = &namesv; + } + while (items--) { + const U32 name_utf8 = SvUTF8(*svp); + STRLEN len; + const char *name = SvPVx_const(*svp++, len); + if(PL_stashcache) + (void)hv_delete(PL_stashcache, name, name_utf8 ? -(I32)len : (I32)len, G_DISCARD); + hv_ename_delete(oldstash, name, len, name_utf8); + + if (!fetched_isarev) { + /* If the name deletion caused a name change, then we + * are not going to call mro_isa_changed_in with this + * name (and not at all if it has become anonymous) so + * we need to delete old isarev entries here, both + * those in the superclasses and this class’s own list + * of subclasses. We simply delete the latter from + * PL_isarev, since we still need it. hv_delete morti- + * fies it for us, so sv_2mortal is not necessary. */ + if(HvENAME_HEK(oldstash) != enamehek) { + if(meta->isa && HvARRAY(meta->isa)) + mro_clean_isarev(meta->isa, name, len, 0, name_utf8); + isarev = (HV *)hv_delete(PL_isarev, name, + name_utf8 ? -(I32)len : (I32)len, 0); + fetched_isarev=TRUE; + } + } + } } } check_stash: if(stash) { - hv_ename_add(stash, name, namlen); - - /* Add it to the big list. We use the stash itself as the value if - * it needs mro_isa_changed_in called on it. Otherwise we just use - * &PL_sv_yes to indicate that we have seen it. */ + if(SvTYPE(namesv) == SVt_PVAV) { + items = AvFILLp((AV *)namesv) + 1; + svp = AvARRAY((AV *)namesv); + } + else { + items = 1; + svp = &namesv; + } + while (items--) { + const U32 name_utf8 = SvUTF8(*svp); + STRLEN len; + const char *name = SvPVx_const(*svp++, len); + hv_ename_add(stash, name, len, name_utf8); + } - /* The stash needs mro_isa_changed_in called on it if it was + /* Add it to the big list if it needs + * mro_isa_changed_in called on it. That happens if it was * detached from the symbol table (so it had no HvENAME) before * being assigned to the spot named by the ‘name’ variable, because - * its cached isa linerisation is now stale (the effective name + * its cached isa linearisation is now stale (the effective name * having changed), and subclasses will then use that cache when * mro_package_moved calls mro_isa_changed_in. (See * [perl #77358].) @@ -886,12 +978,28 @@ S_mro_gather_and_rename(pTHX_ HV * const stashes, HV *stash, HV *oldstash, entry = (HE *) hv_common( - stashes, NULL, (const char *)&stash, sizeof(HV *), 0, + seen_stashes, NULL, (const char *)&stash, sizeof(HV *), 0, HV_FETCH_LVALUE|HV_FETCH_EMPTY_HE, NULL, 0 ); - if(HeVAL(entry) == &PL_sv_yes || HeVAL(entry) == (SV *)stash) + if(HeVAL(entry) == &PL_sv_yes || HeVAL(entry) == &PL_sv_no) stash = NULL; - else HeVAL(entry) = stash_had_name ? &PL_sv_yes : (SV *)stash; + else { + HeVAL(entry) + = HeVAL(entry) == &PL_sv_undef ? &PL_sv_yes : &PL_sv_no; + if(!stash_had_name) + { + struct mro_meta * const meta = HvMROMETA(stash); + (void) + hv_store( + stashes, (const char *)&stash, sizeof(HV *), + meta->isa + ? SvREFCNT_inc_simple_NN((SV *)meta->isa) + : &PL_sv_yes, + 0 + ); + CLEAR_LINEAR(meta); + } + } } if(!stash && !oldstash) @@ -899,35 +1007,69 @@ S_mro_gather_and_rename(pTHX_ HV * const stashes, HV *stash, HV *oldstash, return; /* Add all the subclasses to the big list. */ + if(!fetched_isarev) { + /* If oldstash is not null, then we can use its HvENAME to look up + the isarev hash, since all its subclasses will be listed there. + It will always have an HvENAME. It the HvENAME was removed + above, then fetch_isarev will be true, and this code will not be + reached. + + If oldstash is null, then this is an empty spot with no stash in + it, so subclasses could be listed in isarev hashes belonging to + any of the names, so we have to check all of them. + */ + assert(!oldstash || HvENAME(oldstash)); + if (oldstash) { + /* Extra variable to avoid a compiler warning */ + char * const hvename = HvENAME(oldstash); + fetched_isarev = TRUE; + svp = hv_fetch(PL_isarev, hvename, + HvENAMEUTF8(oldstash) + ? -HvENAMELEN_get(oldstash) + : HvENAMELEN_get(oldstash), 0); + if (svp) isarev = MUTABLE_HV(*svp); + } + else if(SvTYPE(namesv) == SVt_PVAV) { + items = AvFILLp((AV *)namesv) + 1; + svp = AvARRAY((AV *)namesv); + } + else { + items = 1; + svp = &namesv; + } + } if( - isarev - || ( - (svp = hv_fetch(PL_isarev, name, namlen, 0)) - && (isarev = MUTABLE_HV(*svp)) - ) + isarev || !fetched_isarev ) { + while (fetched_isarev || items--) { HE *iter; + + if (!fetched_isarev) { + HE * const he = hv_fetch_ent(PL_isarev, *svp++, 0, 0); + if (!he || !(isarev = MUTABLE_HV(HeVAL(he)))) continue; + } + hv_iterinit(isarev); while((iter = hv_iternext(isarev))) { - I32 len; - const char* const revkey = hv_iterkey(iter, &len); - HV* revstash = gv_stashpvn(revkey, len, 0); + HV* revstash = gv_stashsv(hv_iterkeysv(iter), 0); + struct mro_meta * meta; if(!revstash) continue; - entry - = (HE *) - hv_common( - stashes, NULL, (const char *)&revstash, sizeof(HV *), 0, - HV_FETCH_LVALUE|HV_FETCH_EMPTY_HE, NULL, 0 - ); - HeVAL(entry) = (SV *)revstash; - + meta = HvMROMETA(revstash); + (void) + hv_store( + stashes, (const char *)&revstash, sizeof(HV *), + meta->isa + ? SvREFCNT_inc_simple_NN((SV *)meta->isa) + : &PL_sv_yes, + 0 + ); + CLEAR_LINEAR(meta); } - } - if( - (!stash || !HvARRAY(stash)) && (!oldstash || !HvARRAY(oldstash)) - ) return; + if (fetched_isarev) break; + } + } /* This is partly based on code in hv_iternext_flags. We are not call- ing that here, as we want to avoid resetting the hash iterator. */ @@ -946,18 +1088,21 @@ S_mro_gather_and_rename(pTHX_ HV * const stashes, HV *stash, HV *oldstash, /* Iterate through the entries in this list */ for(; entry; entry = HeNEXT(entry)) { + SV* keysv; const char* key; - I32 len; + STRLEN len; /* If this entry is not a glob, ignore it. Try the next. */ if (!isGV(HeVAL(entry))) continue; - key = hv_iterkey(entry, &len); - if(len > 1 && key[len-2] == ':' && key[len-1] == ':') { + keysv = hv_iterkeysv(entry); + key = SvPV_const(keysv, len); + if ((len > 1 && key[len-2] == ':' && key[len-1] == ':') + || (len == 1 && key[0] == ':')) { HV * const oldsubstash = GvHV(HeVAL(entry)); SV ** const stashentry - = stash ? hv_fetch(stash, key, len, 0) : NULL; + = stash ? hv_fetch(stash, key, SvUTF8(keysv) ? -(I32)len : (I32)len, 0) : NULL; HV *substash = NULL; /* Avoid main::main::main::... */ @@ -972,22 +1117,46 @@ S_mro_gather_and_rename(pTHX_ HV * const stashes, HV *stash, HV *oldstash, ) { /* Add :: and the key (minus the trailing ::) - to newname. */ - SV *namesv - = newSVpvn_flags(name, namlen, SVs_TEMP); - { - const char *name; - STRLEN namlen; - sv_catpvs(namesv, "::"); - sv_catpvn(namesv, key, len-2); - name = SvPV_const(namesv, namlen); - mro_gather_and_rename( - stashes, substash, oldsubstash, name, namlen - ); + to each name. */ + SV *subname; + if(SvTYPE(namesv) == SVt_PVAV) { + SV *aname; + items = AvFILLp((AV *)namesv) + 1; + svp = AvARRAY((AV *)namesv); + subname = sv_2mortal((SV *)newAV()); + while (items--) { + aname = newSVsv(*svp++); + if (len == 1) + sv_catpvs(aname, ":"); + else { + sv_catpvs(aname, "::"); + sv_catpvn_flags( + aname, key, len-2, + SvUTF8(keysv) + ? SV_CATUTF8 : SV_CATBYTES + ); + } + av_push((AV *)subname, aname); + } } + else { + subname = sv_2mortal(newSVsv(namesv)); + if (len == 1) sv_catpvs(subname, ":"); + else { + sv_catpvs(subname, "::"); + sv_catpvn_flags( + subname, key, len-2, + SvUTF8(keysv) ? SV_CATUTF8 : SV_CATBYTES + ); + } + } + mro_gather_and_rename( + stashes, seen_stashes, + substash, oldsubstash, subname + ); } - (void)hv_store(seen, key, len, &PL_sv_yes, 0); + (void)hv_store(seen, key, SvUTF8(keysv) ? -(I32)len : (I32)len, &PL_sv_yes, 0); } } } @@ -996,50 +1165,79 @@ S_mro_gather_and_rename(pTHX_ HV * const stashes, HV *stash, HV *oldstash, /* Skip the entire loop if the hash is empty. */ if (stash && HvUSEDKEYS(stash)) { xhv = (XPVHV*)SvANY(stash); + riter = -1; /* Iterate through the new stash, skipping $seen{$key} items, - calling mro_gather_and_rename(stashes, entry, NULL, ...). */ + calling mro_gather_and_rename(stashes,seen,entry,NULL, ...). */ while (++riter <= (I32)xhv->xhv_max) { entry = (HvARRAY(stash))[riter]; /* Iterate through the entries in this list */ for(; entry; entry = HeNEXT(entry)) { + SV* keysv; const char* key; - I32 len; + STRLEN len; /* If this entry is not a glob, ignore it. Try the next. */ if (!isGV(HeVAL(entry))) continue; - key = hv_iterkey(entry, &len); - if(len > 1 && key[len-2] == ':' && key[len-1] == ':') { + keysv = hv_iterkeysv(entry); + key = SvPV_const(keysv, len); + if ((len > 1 && key[len-2] == ':' && key[len-1] == ':') + || (len == 1 && key[0] == ':')) { HV *substash; /* If this entry was seen when we iterated through the oldstash, skip it. */ - if(seen && hv_exists(seen, key, len)) continue; + if(seen && hv_exists(seen, key, SvUTF8(keysv) ? -(I32)len : (I32)len)) continue; /* We get here only if this stash has no corresponding entry in the stash being replaced. */ substash = GvHV(HeVAL(entry)); if(substash) { - SV *namesv; - const char *subname; - STRLEN subnamlen; + SV *subname; /* Avoid checking main::main::main::... */ if(substash == stash) continue; /* Add :: and the key (minus the trailing ::) - to newname. */ - namesv - = newSVpvn_flags(name, namlen, SVs_TEMP); - sv_catpvs(namesv, "::"); - sv_catpvn(namesv, key, len-2); - subname = SvPV_const(namesv, subnamlen); + to each name. */ + if(SvTYPE(namesv) == SVt_PVAV) { + SV *aname; + items = AvFILLp((AV *)namesv) + 1; + svp = AvARRAY((AV *)namesv); + subname = sv_2mortal((SV *)newAV()); + while (items--) { + aname = newSVsv(*svp++); + if (len == 1) + sv_catpvs(aname, ":"); + else { + sv_catpvs(aname, "::"); + sv_catpvn_flags( + aname, key, len-2, + SvUTF8(keysv) + ? SV_CATUTF8 : SV_CATBYTES + ); + } + av_push((AV *)subname, aname); + } + } + else { + subname = sv_2mortal(newSVsv(namesv)); + if (len == 1) sv_catpvs(subname, ":"); + else { + sv_catpvs(subname, "::"); + sv_catpvn_flags( + subname, key, len-2, + SvUTF8(keysv) ? SV_CATUTF8 : SV_CATBYTES + ); + } + } mro_gather_and_rename( - stashes, substash, NULL, subname, subnamlen + stashes, seen_stashes, + substash, NULL, subname ); } } @@ -1083,8 +1281,10 @@ Perl_mro_method_changed_in(pTHX_ HV *stash) { const char * const stashname = HvENAME_get(stash); const STRLEN stashname_len = HvENAMELEN_get(stash); + const bool stashname_utf8 = HvENAMEUTF8(stash) ? 1 : 0; - SV ** const svp = hv_fetch(PL_isarev, stashname, stashname_len, 0); + SV ** const svp = hv_fetch(PL_isarev, stashname, + stashname_utf8 ? -(I32)stashname_len : (I32)stashname_len, 0); HV * const isarev = svp ? MUTABLE_HV(*svp) : NULL; PERL_ARGS_ASSERT_MRO_METHOD_CHANGED_IN; @@ -1110,9 +1310,7 @@ Perl_mro_method_changed_in(pTHX_ HV *stash) hv_iterinit(isarev); while((iter = hv_iternext(isarev))) { - I32 len; - const char* const revkey = hv_iterkey(iter, &len); - HV* const revstash = gv_stashpvn(revkey, len, 0); + HV* const revstash = gv_stashsv(hv_iterkeysv(iter), 0); struct mro_meta* mrometa; if(!revstash) continue;