xcv_root and xcv_xsub can also be merged into a union, providing a new

flag is added to denote whether the PVCV is perl or XSUB.

p4raw-id: //depot/perl@27244

1 files changed, 12 insertions, 6 deletions

diff --git a/sv.h b/sv.h
index e85fd7ae49..a3f28db410 100644
--- a/sv.h
+++ b/sv.h
@@ -434,8 +434,10 @@ struct xpvfm {
 	OP *	xcv_start;
 	ANY	xcv_xsubany;
     }		xcv_start_u;
-    OP *	xcv_root;
-    void      (*xcv_xsub)(pTHX_ CV*);
+    union {
+	OP *	xcv_root;
+	void	(*xcv_xsub) (pTHX_ CV*);
+    }		xcv_root_u;
     GV *	xcv_gv;
     char *	xcv_file;
     long	xcv_depth;	/* >= 2 indicates recursive call */
@@ -460,10 +462,14 @@ typedef struct {
     HV*		xmg_stash;	/* class package */
 
     HV *	xcv_stash;
-    OP *	xcv_start;
-    OP *	xcv_root;
-    void      (*xcv_xsub)(pTHX_ CV*);
-    ANY		xcv_xsubany;
+    union {
+	OP *	xcv_start;
+	ANY	xcv_xsubany;
+    }		xcv_start_u;
+    union {
+	OP *	xcv_root;
+	void	(*xcv_xsub) (pTHX_ CV*);
+    }		xcv_root_u;
     GV *	xcv_gv;
     char *	xcv_file;
     long	xcv_depth;	/* >= 2 indicates recursive call */