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/av.h b/av.h
index 15ca6977d6..61a01f0896 100644
--- a/av.h
+++ b/av.h
@@ -17,7 +17,10 @@ struct xpvav {
 	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 */
 };
 
@@ -32,7 +35,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 */
 } xpvav_allocated;
 #endif