diff options
Diffstat (limited to 'ext/mro')
| -rw-r--r-- | ext/mro/mro.xs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/mro/mro.xs b/ext/mro/mro.xs index acccdd5a3d..63befa9d23 100644 --- a/ext/mro/mro.xs +++ b/ext/mro/mro.xs @@ -482,7 +482,7 @@ mro__nextcan(...) const char *hvname; I32 entries; struct mro_meta* selfmeta; - bool searching_univ = FALSE; + bool seen_univ = FALSE; HV* nmcache; I32 i; PPCODE: @@ -633,7 +633,9 @@ mro__nextcan(...) assert(curstash); - if (searching_univ && curstash == selfstash) break; + if (!seen_univ && SvCUR(linear_sv) == 9 + && strnEQ(SvPV_nolen_const(linear_sv), "UNIVERSAL", 9)) + seen_univ = TRUE; gvp = (GV**)hv_fetch(curstash, subname, subname_len, 0); if (!gvp) continue; @@ -656,15 +658,12 @@ mro__nextcan(...) } } - if (!searching_univ) { - HV * const unistash = gv_stashpvn("UNIVERSAL", 9, 0); - if (unistash) { - linear_av = S_mro_get_linear_isa_c3(aTHX_ unistash, 0); + if (!seen_univ && (selfstash = gv_stashpvn("UNIVERSAL", 9, 0))) { + linear_av = S_mro_get_linear_isa_c3(aTHX_ selfstash, 0); linear_svp = AvARRAY(linear_av); entries = AvFILLp(linear_av) + 1; - searching_univ = TRUE; + seen_univ = TRUE; goto retry; - } } (void)hv_store_ent(nmcache, sv, &PL_sv_undef, 0); |