Store the stash for our in the magic slot. This will allow us to use

PVMGs in pad names where previously PVGVs were used. In turn, this
gives much greater flexibility for the layout of PVGVs.

p4raw-id: //depot/perl@27312

1 files changed, 8 insertions, 2 deletions

diff --git a/hv.h b/hv.h
index 9f9c1e38e3..0fd0e6b6c0 100644
--- a/hv.h
+++ b/hv.h
@@ -57,7 +57,10 @@ struct xpvhv {
 	UV	xivu_uv;
 	void *	xivu_p1;
     }		xiv_u;
-    MAGIC*	xmg_magic;	/* magic for scalar array */
+    union {
+	MAGIC*	xmg_magic;	/* linked list of magicalness */
+	HV*	xmg_ourstash;	/* Stash for our (when SvPAD_OUR is true) */
+    } xmg_u;
     HV*		xmg_stash;	/* class package */
 };
 
@@ -74,7 +77,10 @@ typedef struct {
 	UV	xivu_uv;
 	void *	xivu_p1;
     }		xiv_u;
-    MAGIC*	xmg_magic;	/* magic for scalar array */
+    union {
+	MAGIC*	xmg_magic;	/* linked list of magicalness */
+	HV*	xmg_ourstash;	/* Stash for our (when SvPAD_OUR is true) */
+    } xmg_u;
     HV*		xmg_stash;	/* class package */
 } xpvhv_allocated;
 #endif