Change the IV to a union.

Revert the NV union back to a plain NV
Transpose the positions of IV and NV (NV is now first)
Don't allocate the NV for PV,PVIV,PVAV and PVHV (last 2 non-allocations
currently disabled by default)

p4raw-id: //depot/perl@24617

1 files changed, 5 insertions, 10 deletions

diff --git a/cv.h b/cv.h
index ba8364b9e6..799f8d4ee1 100644
--- a/cv.h
+++ b/cv.h
@@ -12,19 +12,14 @@
  * in sv.h  */
 
 struct xpvcv {
-    IV		awaiting_redevelopment;	/* integer value */
+    NV		xnv_nv;		/* numeric value, if any */
     STRLEN	xpv_cur;	/* length of xp_pv as a C string */
     STRLEN	xpv_len;	/* allocated size */
     union {
-	struct {
-	    void *xnv_p1;
-	    union {
-		void *xnv_p2;
-		IV xnv_i2;
-	    }	xnv_u2;
-	}	xnv_s;
-	NV	xnvu_nv;	/* numeric value, if any */
-    }		xnv_u;
+	IV	xivu_iv;	/* integer value or pv offset */
+	UV	xivu_uv;
+	void *	xivu_p1;
+    }		xiv_u;
     MAGIC*	xmg_magic;	/* magic for scalar array */
     HV*		xmg_stash;	/* class package */