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/cv.h b/cv.h
index dd4e3ec0d7..960e72735b 100644
--- a/cv.h
+++ b/cv.h
@@ -20,7 +20,10 @@ struct xpvcv {
 	void *	xivu_p1;
 	I32	xivu_i32;	/* depth, >= 2 indicates recursive call */
     }		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 */
 
     HV *	xcv_stash;
@@ -51,7 +54,10 @@ typedef struct {
 	void *	xivu_p1;
 	I32	xivu_i32;	/* depth, >= 2 indicates recursive call */
     }		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 */
 
     HV *	xcv_stash;