We don't need IV and RV arena variables anymore. We don't need to set

SvIVX or SvNVX on hashes.

p4raw-id: //depot/perl@24547

diff --git a/embedvar.h b/embedvar.h
index 760a53f..d0c3a46 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -436,8 +436,6 @@
 #define PL_uudmap              (vTHX->Iuudmap)
 #define PL_warnhook            (vTHX->Iwarnhook)
 #define PL_widesyscalls                (vTHX->Iwidesyscalls)
-#define PL_xiv_arenaroot       (vTHX->Ixiv_arenaroot)
-#define PL_xiv_root            (vTHX->Ixiv_root)
 #define PL_xnv_arenaroot       (vTHX->Ixnv_arenaroot)
 #define PL_xnv_root            (vTHX->Ixnv_root)
 #define PL_xpv_arenaroot       (vTHX->Ixpv_arenaroot)
@@ -460,8 +458,6 @@
 #define PL_xpvmg_root          (vTHX->Ixpvmg_root)
 #define PL_xpvnv_arenaroot     (vTHX->Ixpvnv_arenaroot)
 #define PL_xpvnv_root          (vTHX->Ixpvnv_root)
-#define PL_xrv_arenaroot       (vTHX->Ixrv_arenaroot)
-#define PL_xrv_root            (vTHX->Ixrv_root)
 #define PL_yycharp             (vTHX->Iyycharp)
 #define PL_yylvalp             (vTHX->Iyylvalp)
 
@@ -744,8 +740,6 @@
 #define PL_Iuudmap             PL_uudmap
 #define PL_Iwarnhook           PL_warnhook
 #define PL_Iwidesyscalls       PL_widesyscalls
-#define PL_Ixiv_arenaroot      PL_xiv_arenaroot
-#define PL_Ixiv_root           PL_xiv_root
 #define PL_Ixnv_arenaroot      PL_xnv_arenaroot
 #define PL_Ixnv_root           PL_xnv_root
 #define PL_Ixpv_arenaroot      PL_xpv_arenaroot
@@ -768,8 +762,6 @@
 #define PL_Ixpvmg_root         PL_xpvmg_root
 #define PL_Ixpvnv_arenaroot    PL_xpvnv_arenaroot
 #define PL_Ixpvnv_root         PL_xpvnv_root
-#define PL_Ixrv_arenaroot      PL_xrv_arenaroot
-#define PL_Ixrv_root           PL_xrv_root
 #define PL_Iyycharp            PL_yycharp
 #define PL_Iyylvalp            PL_yylvalp
 

diff --git a/intrpvar.h b/intrpvar.h
index 7e243dd..cb8231c 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -249,10 +249,7 @@ PERLVARI(Ish_path_compat,  const char *,   SH_PATH)/* full path of shell */
 
 PERLVAR(Isighandlerp,  Sighandler_t)
 
-PERLVAR(Ixiv_arenaroot,        XPV*)           /* list of allocated xiv areas */
-PERLVAR(Ixiv_root,     IV *)           /* free xiv list */
 PERLVAR(Ixnv_root,     NV *)           /* free xnv list */
-PERLVAR(Ixrv_root,     XRV *)          /* free xrv list */
 PERLVAR(Ixpv_root,     xpv_allocated *)        /* free xpv list */
 PERLVAR(Ixpviv_root,   XPVIV *)        /* free xpviv list */
 PERLVAR(Ixpvnv_root,   XPVNV *)        /* free xpvnv list */
@@ -432,7 +429,6 @@ PERLVAR(Iptr_table, PTR_TBL_t*)
 PERLVARI(Ibeginav_save, AV*, Nullav)   /* save BEGIN{}s when compiling */
 
 PERLVAR(Ixnv_arenaroot,        XPV*)           /* list of allocated xnv areas */
-PERLVAR(Ixrv_arenaroot,        XPV*)           /* list of allocated xrv areas */
 PERLVAR(Ixpv_arenaroot,        xpv_allocated *)        /* list of allocated xpv areas */
 PERLVAR(Ixpviv_arenaroot,XPVIV*)       /* list of allocated xpviv areas */
 PERLVAR(Ixpvnv_arenaroot,XPVNV*)       /* list of allocated xpvnv areas */

diff --git a/perlapi.h b/perlapi.h
index 46177d2..1702029 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -651,10 +651,6 @@ END_EXTERN_C
 #define PL_warnhook            (*Perl_Iwarnhook_ptr(aTHX))
 #undef  PL_widesyscalls
 #define PL_widesyscalls                (*Perl_Iwidesyscalls_ptr(aTHX))
-#undef  PL_xiv_arenaroot
-#define PL_xiv_arenaroot       (*Perl_Ixiv_arenaroot_ptr(aTHX))
-#undef  PL_xiv_root
-#define PL_xiv_root            (*Perl_Ixiv_root_ptr(aTHX))
 #undef  PL_xnv_arenaroot
 #define PL_xnv_arenaroot       (*Perl_Ixnv_arenaroot_ptr(aTHX))
 #undef  PL_xnv_root
@@ -699,10 +695,6 @@ END_EXTERN_C
 #define PL_xpvnv_arenaroot     (*Perl_Ixpvnv_arenaroot_ptr(aTHX))
 #undef  PL_xpvnv_root
 #define PL_xpvnv_root          (*Perl_Ixpvnv_root_ptr(aTHX))
-#undef  PL_xrv_arenaroot
-#define PL_xrv_arenaroot       (*Perl_Ixrv_arenaroot_ptr(aTHX))
-#undef  PL_xrv_root
-#define PL_xrv_root            (*Perl_Ixrv_root_ptr(aTHX))
 #undef  PL_yycharp
 #define PL_yycharp             (*Perl_Iyycharp_ptr(aTHX))
 #undef  PL_yylvalp

diff --git a/sv.c b/sv.c
index a2c4835..8fe9be0 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -1872,8 +1872,6 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt)
            AvALLOC(sv) = 0;
            AvARYLEN(sv)= 0;
            AvREAL_only(sv);
-           SvIV_set(sv, 0);
-           SvNV_set(sv, 0.0);
        }
        /* to here.  */
        /* XXX? Only SVt_NULL is ever upgraded to AV or HV?  */
@@ -10877,8 +10875,6 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param)
        SvANY(dstr)     = new_XPVAV();
        SvCUR_set(dstr, SvCUR(sstr));
        SvLEN_set(dstr, SvLEN(sstr));
-       SvIV_set(dstr, SvIVX(sstr));
-       SvNV_set(dstr, SvNVX(sstr));
        SvMAGIC_set(dstr, mg_dup(SvMAGIC(sstr), param));
        SvSTASH_set(dstr, hv_dup_inc(SvSTASH(sstr), param));
        AvARYLEN((AV*)dstr) = sv_dup_inc(AvARYLEN((AV*)sstr), param);
@@ -10913,8 +10909,6 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param)
        SvANY(dstr)     = new_XPVHV();
        SvCUR_set(dstr, SvCUR(sstr));
        SvLEN_set(dstr, SvLEN(sstr));
-       SvIV_set(dstr, SvIVX(sstr));
-       SvNV_set(dstr, SvNVX(sstr));
        SvMAGIC_set(dstr, mg_dup(SvMAGIC(sstr), param));
        SvSTASH_set(dstr, hv_dup_inc(SvSTASH(sstr), param));
        {