don't call mro_method_changed_in on anon stashes

[gitmo/Package-Stash-XS.git] / XS.xs

diff --git a/XS.xs b/XS.xs
index 4fcd6e8..d3ce6aa 100644 (file)
--- a/XS.xs
+++ b/XS.xs
@@ -101,7 +101,8 @@
         GvASSUMECV_on(g);               \
     }                                   \
     GvCVGEN(g) = 0;                     \
-    mro_method_changed_in(GvSTASH(g));  \
+    if (HvENAME_get(GvSTASH(g)))        \
+        mro_method_changed_in(GvSTASH(g)); \
 } while (0)
 #define GvSetIO(g,v) do {               \
     SvREFCNT_dec(GvIO(g));              \
@@ -326,16 +327,32 @@ static SV *_get_name(SV *self)
 
 static void _expand_glob(SV *self, SV *varname)
 {
-    SV *name;
+    HV *namespace;
+    HE *entry;
+    GV *glob;
 
-    name = newSVsv(_get_name(self));
-    sv_catpvs(name, "::");
-    sv_catsv(name, varname);
+    namespace = _get_namespace(self);
 
-    /* can't use gv_init here, because it screws up @ISA in a way that I
-     * can't reproduce, but that CMOP triggers */
-    gv_fetchsv(name, GV_ADD, SVt_NULL);
-    SvREFCNT_dec(name);
+    if (entry = hv_fetch_ent(namespace, varname, 0, 0)) {
+        glob = (GV*)HeVAL(entry);
+        if (isGV(glob)) {
+            croak("_expand_glob called on stash slot with expanded glob");
+        }
+        else {
+            char *varname_pv;
+            STRLEN varname_len;
+
+            varname_pv = SvPV(varname, varname_len);
+            gv_init(glob, namespace, varname_pv, varname_len, 1);
+            SvREFCNT_inc(glob);
+            if (!hv_store_ent(namespace, varname, (SV*)glob, 0)) {
+                croak("hv_store failed");
+            }
+        }
+    }
+    else {
+        croak("_expand_glob called on nonexistent stash slot");
+    }
 }
 
 static SV *_get_symbol(SV *self, varspec_t *variable, int vivify)
@@ -566,8 +583,11 @@ add_symbol(self, variable, initial=NULL, ...)
         glob = (GV*)HeVAL(entry);
     }
     else {
+        char *varname_pv;
+        STRLEN varname_len;
         glob = (GV*)newSV(0);
-        gv_init(glob, namespace, "ANON", 4, 1);
+        varname_pv = SvPV(variable.name, varname_len);
+        gv_init(glob, namespace, varname_pv, varname_len, 1);
         if (!hv_store_ent(namespace, variable.name, (SV*)glob, 0)) {
             croak("hv_store failed");
         }