[patch@27529] thread.h - VMS needs more stack

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

diff --git a/gv.h b/gv.h
index 81a42cf..e0cfeaa 100644 (file)
--- a/gv.h
+++ b/gv.h
@@ -27,46 +27,45 @@ struct gp {
 
 #if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #  define GvGP(gv)                                                     \
-       (*({GV *const shplep = (GV *) gv;                               \
+       (*({GV *const shplep = (GV *) (gv);                             \
            assert(SvTYPE(shplep) == SVt_PVGV ||                        \
            SvTYPE(shplep) == SVt_PVLV);                                \
            assert(isGV_with_GP(shplep));                               \
            &((shplep)->sv_u.svu_gp);}))
 #  define GvFLAGS(gv)                                                  \
-       (*({GV *const yaah  = (GV *) gv;                                \
+       (*({GV *const yaah  = (GV *) (gv);                              \
            assert(SvTYPE(yaah) == SVt_PVGV || SvTYPE(yaah) == SVt_PVLV); \
            assert(isGV_with_GP(yaah));                                 \
-           &(GvXPVGV(yaah)->xgv_flags);}))
+           &(GvXPVGV(yaah)->xpv_cur);}))
 #  define GvSTASH(gv)                                                  \
-       (*({ GV *_gv = (GV *) gv;                                       \
+       (*({ GV * const _gv = (GV *) (gv);                              \
            assert(isGV_with_GP(_gv));                                  \
            assert(SvTYPE(_gv) == SVt_PVGV || SvTYPE(_gv) >= SVt_PVLV); \
            &(GvXPVGV(_gv)->xnv_u.xgv_stash);                           \
         }))
-#  define GvNAME(gv)                                                   \
-       (*({ GV *zzzz = (GV *) gv;                                      \
-           assert(isGV_with_GP(zzzz));                                 \
-           assert(SvTYPE(zzzz) == SVt_PVGV || SvTYPE(zzzz) >= SVt_PVLV); \
-           &(GvXPVGV(zzzz)->xgv_name);                                 \
-        }))
-#  define GvNAMELEN(gv)                                                        \
-       (*({ GV *glank = (GV *) gv;                                     \
-           assert(isGV_with_GP(glank));                                \
-           assert(SvTYPE(glank) == SVt_PVGV || SvTYPE(glank) >= SVt_PVLV); \
-           &(GvXPVGV(glank)->xgv_namelen);                             \
+#  define GvNAME_HEK(gv)                                               \
+       (*({ GV * const zzzz = (GV *) (gv);                             \
+          assert(isGV_with_GP(zzzz));                                  \
+          assert(SvTYPE(zzzz) == SVt_PVGV || SvTYPE(zzzz) >= SVt_PVLV); \
+          &(GvXPVGV(zzzz)->xiv_u.xivu_namehek);                        \
         }))
 #else
 #  define GvGP(gv)     ((gv)->sv_u.svu_gp)
-#  define GvFLAGS(gv)  (GvXPVGV(gv)->xgv_flags)
+#  define GvFLAGS(gv)  (GvXPVGV(gv)->xpv_cur)
 #  define GvSTASH(gv)  (GvXPVGV(gv)->xnv_u.xgv_stash)
-#  define GvNAME(gv)   (GvXPVGV(gv)->xgv_name)
-#  define GvNAMELEN(gv)        (GvXPVGV(gv)->xgv_namelen)
+#  define GvNAME_HEK(gv)       (GvXPVGV(gv)->xiv_u.xivu_namehek)
 #endif
 
-#define        GvASSIGN_GENERATION(gv)         (0 + ((XPV*) SvANY(gv))->xpv_cur)
+#define GvNAME_get(gv)         (GvNAME_HEK(gv) ? HEK_KEY(GvNAME_HEK(gv)) : 0)
+#define GvNAMELEN_get(gv)      (GvNAME_HEK(gv) ? HEK_LEN(GvNAME_HEK(gv)) : 0)
+
+#define GvNAME(gv)     GvNAME_get(gv)
+#define GvNAMELEN(gv)  GvNAMELEN_get(gv)
+
+#define        GvASSIGN_GENERATION(gv)         (0 + ((XPV*) SvANY(gv))->xpv_len)
 #define        GvASSIGN_GENERATION_set(gv,val)                 \
        STMT_START { assert(SvTYPE(gv) == SVt_PVGV);    \
-               (((XPV*) SvANY(gv))->xpv_cur = (val)); } STMT_END
+               (((XPV*) SvANY(gv))->xpv_len = (val)); } STMT_END
 
 /*
 =head1 GV Functions
@@ -188,7 +187,9 @@ Return the SV from the GV.
 /*
  * symbol creation flags, for use in gv_fetchpv() and get_*v()
  */
-#define GV_ADD         0x01    /* add, if symbol not already there */
+#define GV_ADD         0x01    /* add, if symbol not already there
+                                  For gv_name_set, adding a HEK for the first
+                                  time, so don't try to free what's there.  */
 #define GV_ADDMULTI    0x02    /* add, pretending it has been added already */
 #define GV_ADDWARN     0x04    /* add, but warn if symbol wasn't already there */
 #define GV_ADDINEVAL   0x08    /* add, as though we're doing so within an eval */