X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=gv.h;h=6ef8ee61676626b0b860e3606b08d7f42daaabad;hb=e573f90328e9db84c5405db01c52908bfac9286d;hp=ab745522e0f52d0f0610b6e5e800763be9bef179;hpb=d4c19fe8d8a6e04364af0548bf783e83ab5987d2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/gv.h b/gv.h
index ab74552..6ef8ee6 100644
--- a/gv.h
+++ b/gv.h
@@ -19,13 +19,13 @@ struct gp {
     CV *	gp_cv;		/* subroutine value */
     U32		gp_cvgen;	/* generational validity of cached gv_cv */
     line_t	gp_line;	/* line first declared at (for -w) */
-    char *	gp_file;	/* file first declared in (for -w) */
+    HEK *	gp_file_hek;	/* file first declared in (for -w) */
 };
 
 #define GvXPVGV(gv)	((XPVGV*)SvANY(gv))
 
 
-#if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
+#if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__INTEL_COMPILER)
 #  define GvGP(gv)							\
 	(*({GV *const shplep = (GV *) (gv);				\
 	    assert(SvTYPE(shplep) == SVt_PVGV || SvTYPE(shplep) == SVt_PVLV); \
@@ -48,16 +48,17 @@ struct gp {
 	   assert(SvTYPE(zzzz) == SVt_PVGV || SvTYPE(zzzz) >= SVt_PVLV); \
 	   &(GvXPVGV(zzzz)->xiv_u.xivu_namehek);			\
 	 }))
+#  define GvNAME_get(gv)	({ assert(GvNAME_HEK(gv)); HEK_KEY(GvNAME_HEK(gv)); })
+#  define GvNAMELEN_get(gv)	({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); })
 #else
 #  define GvGP(gv)	((gv)->sv_u.svu_gp)
 #  define GvFLAGS(gv)	(GvXPVGV(gv)->xpv_cur)
 #  define GvSTASH(gv)	(GvXPVGV(gv)->xnv_u.xgv_stash)
 #  define GvNAME_HEK(gv)	(GvXPVGV(gv)->xiv_u.xivu_namehek)
+#  define GvNAME_get(gv)	HEK_KEY(GvNAME_HEK(gv))
+#  define GvNAMELEN_get(gv)	HEK_LEN(GvNAME_HEK(gv))
 #endif
 
-#define GvNAME_get(gv)		(GvNAME_HEK(gv) ? HEK_KEY(GvNAME_HEK(gv)) : NULL)
-#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)
 
@@ -110,7 +111,8 @@ Return the SV from the GV.
 #define GvCVu(gv)	(GvGP(gv)->gp_cvgen ? NULL : GvGP(gv)->gp_cv)
 
 #define GvLINE(gv)	(GvGP(gv)->gp_line)
-#define GvFILE(gv)	(GvGP(gv)->gp_file)
+#define GvFILE_HEK(gv)	(GvGP(gv)->gp_file_hek)
+#define GvFILE(gv)	HEK_KEY(GvFILE_HEK(gv))
 #define GvFILEGV(gv)	(gv_fetchfile(GvFILE(gv)))
 
 #define GvEGV(gv)	(GvGP(gv)->gp_egv)
@@ -164,8 +166,8 @@ Return the SV from the GV.
 #define GvIN_PAD_off(gv)	(GvFLAGS(gv) &= ~GVf_IN_PAD)
 
 #define GvUNIQUE(gv)            0
-#define GvUNIQUE_on(gv)
-#define GvUNIQUE_off(gv)
+#define GvUNIQUE_on(gv)         NOOP
+#define GvUNIQUE_off(gv)        NOOP
 
 #ifdef USE_ITHREADS
 #define GV_UNIQUE_CHECK
@@ -207,3 +209,13 @@ Return the SV from the GV.
 #define gv_fullname3(sv,gv,prefix) gv_fullname4(sv,gv,prefix,TRUE)
 #define gv_efullname3(sv,gv,prefix) gv_efullname4(sv,gv,prefix,TRUE)
 #define gv_fetchmethod(stash, name) gv_fetchmethod_autoload(stash, name, TRUE)
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */