patch@27385 - VMS thread fixes (was: threads and VMS)

[p5sagit/p5-mst-13.2.git] / gv.c

diff --git a/gv.c b/gv.c
index f6c2087..d02f741 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -215,7 +215,7 @@ Perl_gv_init(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, int multi)
     GvSTASH(gv) = stash;
     if (stash)
        Perl_sv_add_backref(aTHX_ (SV*)stash, (SV*)gv);
-    gv_name_set(gv, name, len, 0);
+    gv_name_set(gv, name, len, GV_ADD);
     if (multi || doproto)              /* doproto means it _was_ mentioned */
        GvMULTI_on(gv);
     if (doproto) {                     /* Replicate part of newSUB here. */
@@ -2107,11 +2107,19 @@ void
 Perl_gv_name_set(pTHX_ GV *gv, const char *name, U32 len, U32 flags)
 {
     dVAR;
+    U32 hash;
 
     PERL_UNUSED_ARG(flags);
 
-    GvXPVGV(gv)->xgv_name = name ? savepvn(name, len) : NULL;
-    GvXPVGV(gv)->xgv_namelen = len;
+    if (len > I32_MAX)
+       Perl_croak(aTHX_ "panic: gv name too long (%"UVuf")", (UV) len);
+
+    if (!(flags & GV_ADD) && GvNAME_HEK(gv)) {
+       unshare_hek(GvNAME_HEK(gv));
+    }
+
+    PERL_HASH(hash, name, len);
+    GvNAME_HEK(gv) = name ? share_hek(name, len, hash) : 0;
 }
 
 /*