Re: pmdynflags and thread safety

[perl5.git] / pad.c

diff --git a/pad.c b/pad.c
index ed68c40..8560d9a 100644 (file)
--- a/pad.c
+++ b/pad.c
@@ -1,6 +1,6 @@
 /*    pad.c
  *
 /*    pad.c
  *

- *    Copyright (C) 2002, 2003, 2004, 2005 by Larry Wall and others
+ *    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 by Larry Wall and others

  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.


@@ -72,19 +72,19 @@ but only by their index allocated at compile time (which is usually
 in PL_op->op_targ), wasting a name SV for them doesn't make sense.
 
 The SVs in the names AV have their PV being the name of the variable.
 in PL_op->op_targ), wasting a name SV for them doesn't make sense.
 
 The SVs in the names AV have their PV being the name of the variable.

-NV+1..IV inclusive is a range of cop_seq numbers for which the name is
-valid.  For typed lexicals name SV is SVt_PVMG and SvSTASH points at the
-type.  For C<our> lexicals, the type is SVt_PVGV, and GvSTASH points at the
-stash of the associated global (so that duplicate C<our> delarations in the
-same package can be detected).  SvCUR is sometimes hijacked to
-store the generation number during compilation.
+xlow+1..xhigh inclusive in the NV union is a range of cop_seq numbers for
+which the name is valid.  For typed lexicals name SV is SVt_PVMG and SvSTASH
+points at the type.  For C<our> lexicals, the type is also SVt_PVMG, with the
+SvOURSTASH slot pointing at the stash of the associated global (so that
+duplicate C<our> declarations in the same package can be detected).  SvUVX is
+sometimes hijacked to store the generation number during compilation.

 
 If SvFAKE is set on the name SV, then that slot in the frame AV is
 a REFCNT'ed reference to a lexical from "outside". In this case,
 
 If SvFAKE is set on the name SV, then that slot in the frame AV is
 a REFCNT'ed reference to a lexical from "outside". In this case,

-the name SV does not use NVX and IVX to store a cop_seq range, since it is
-in scope throughout. Instead IVX stores some flags containing info about
+the name SV does not use xlow and xhigh to store a cop_seq range, since it is
+in scope throughout. Instead xhigh stores some flags containing info about

 the real lexical (is it declared in an anon, and is it capable of being
 the real lexical (is it declared in an anon, and is it capable of being

-instantiated multiple times?), and for fake ANONs, NVX contains the index
+instantiated multiple times?), and for fake ANONs, xlow contains the index

 within the parent's pad where the lexical's value is stored, to make
 cloning quicker.
 
 within the parent's pad where the lexical's value is stored, to make
 cloning quicker.
 


@@ -109,11 +109,26 @@ to be generated in evals, such as
 #include "EXTERN.h"
 #define PERL_IN_PAD_C
 #include "perl.h"
 #include "EXTERN.h"
 #define PERL_IN_PAD_C
 #include "perl.h"

+#include "keywords.h"

 
 

+#define COP_SEQ_RANGE_LOW_set(sv,val)          \
+  STMT_START { ((XPVNV*)SvANY(sv))->xnv_u.xpad_cop_seq.xlow = (val); } STMT_END
+#define COP_SEQ_RANGE_HIGH_set(sv,val)         \
+  STMT_START { ((XPVNV*)SvANY(sv))->xnv_u.xpad_cop_seq.xhigh = (val); } STMT_END

 
 

-#define PAD_MAX 999999999
+#define PARENT_PAD_INDEX_set(sv,val)           \
+  STMT_START { ((XPVNV*)SvANY(sv))->xnv_u.xpad_cop_seq.xlow = (val); } STMT_END
+#define PARENT_FAKELEX_FLAGS_set(sv,val)       \
+  STMT_START { ((XPVNV*)SvANY(sv))->xnv_u.xpad_cop_seq.xhigh = (val); } STMT_END

 
 

+#define PAD_MAX I32_MAX

 
 

+#ifdef PERL_MAD
+void pad_peg(const char* s) {
+    static int pegcnt;
+    pegcnt++;
+}
+#endif

 
 /*
 =for apidoc pad_new
 
 /*
 =for apidoc pad_new


@@ -132,6 +147,7 @@ can be OR'ed together:
 PADLIST *
 Perl_pad_new(pTHX_ int flags)
 {
 PADLIST *
 Perl_pad_new(pTHX_ int flags)
 {

+    dVAR;

     AV *padlist, *padname, *pad;
 
     ASSERT_CURPAD_LEGAL("pad_new");
     AV *padlist, *padname, *pad;
 
     ASSERT_CURPAD_LEGAL("pad_new");


@@ -179,7 +195,7 @@ Perl_pad_new(pTHX_ int flags)
        AvREIFY_only(a0);
     }
     else {
        AvREIFY_only(a0);
     }
     else {

-       av_store(pad, 0, Nullsv);
+       av_store(pad, 0, NULL);

     }
 
     AvREAL_off(padlist);
     }
 
     AvREAL_off(padlist);


@@ -228,12 +244,14 @@ taken)
 void
 Perl_pad_undef(pTHX_ CV* cv)
 {
 void
 Perl_pad_undef(pTHX_ CV* cv)
 {

+    dVAR;

     I32 ix;
     I32 ix;

-    const PADLIST *padlist = CvPADLIST(cv);
+    const PADLIST * const padlist = CvPADLIST(cv);

 
 

+    pad_peg("pad_undef");

     if (!padlist)
        return;
     if (!padlist)
        return;

-    if (!SvREFCNT(CvPADLIST(cv))) /* may be during global destruction */
+    if (SvIS_FREED(padlist)) /* may be during global destruction */

        return;
 
     DEBUG_X(PerlIO_printf(Perl_debug_log,
        return;
 
     DEBUG_X(PerlIO_printf(Perl_debug_log,


@@ -262,50 +280,48 @@ Perl_pad_undef(pTHX_ CV* cv)
                CV * const innercv = (CV*)curpad[ix];
                U32 inner_rc = SvREFCNT(innercv);
                assert(inner_rc);
                CV * const innercv = (CV*)curpad[ix];
                U32 inner_rc = SvREFCNT(innercv);
                assert(inner_rc);

-               namepad[ix] = Nullsv;
+               namepad[ix] = NULL;

                SvREFCNT_dec(namesv);
 
                if (SvREFCNT(comppad) < 2) { /* allow for /(?{ sub{} })/  */
                SvREFCNT_dec(namesv);
 
                if (SvREFCNT(comppad) < 2) { /* allow for /(?{ sub{} })/  */

-                   curpad[ix] = Nullsv;
+                   curpad[ix] = NULL;

                    SvREFCNT_dec(innercv);
                    inner_rc--;
                }
                    SvREFCNT_dec(innercv);
                    inner_rc--;
                }

-               if (inner_rc /* in use, not just a prototype */
-                   && CvOUTSIDE(innercv) == cv)
-               {
+
+               /* in use, not just a prototype */
+               if (inner_rc && (CvOUTSIDE(innercv) == cv)) {

                    assert(CvWEAKOUTSIDE(innercv));
                    /* don't relink to grandfather if he's being freed */
                    if (outercv && SvREFCNT(outercv)) {
                        CvWEAKOUTSIDE_off(innercv);
                        CvOUTSIDE(innercv) = outercv;
                        CvOUTSIDE_SEQ(innercv) = seq;
                    assert(CvWEAKOUTSIDE(innercv));
                    /* don't relink to grandfather if he's being freed */
                    if (outercv && SvREFCNT(outercv)) {
                        CvWEAKOUTSIDE_off(innercv);
                        CvOUTSIDE(innercv) = outercv;
                        CvOUTSIDE_SEQ(innercv) = seq;

-                       (void)SvREFCNT_inc(outercv);
+                       SvREFCNT_inc_simple_void_NN(outercv);

                    }
                    else {
                    }
                    else {

-                       CvOUTSIDE(innercv) = Nullcv;
+                       CvOUTSIDE(innercv) = NULL;

                    }
                    }

-

                }
                }

-

            }
        }
     }
 
     ix = AvFILLp(padlist);
     while (ix >= 0) {
            }
        }
     }
 
     ix = AvFILLp(padlist);
     while (ix >= 0) {

-       SV* const sv = AvARRAY(padlist)[ix--];
-       if (!sv)
-           continue;
-       if (sv == (SV*)PL_comppad_name)
-           PL_comppad_name = Nullav;
-       else if (sv == (SV*)PL_comppad) {
-           PL_comppad = Null(PAD*);
-           PL_curpad = Null(SV**);
+       const SV* const sv = AvARRAY(padlist)[ix--];
+       if (sv) {
+           if (sv == (SV*)PL_comppad_name)
+               PL_comppad_name = NULL;
+           else if (sv == (SV*)PL_comppad) {
+               PL_comppad = NULL;
+               PL_curpad = NULL;
+           }

        }
        SvREFCNT_dec(sv);
     }
     SvREFCNT_dec((SV*)CvPADLIST(cv));
        }
        SvREFCNT_dec(sv);
     }
     SvREFCNT_dec((SV*)CvPADLIST(cv));

-    CvPADLIST(cv) = Null(PADLIST*);
+    CvPADLIST(cv) = NULL;

 }
 
 
 }
 
 


@@ -319,7 +335,7 @@ offset.
 If C<typestash> is valid, the name is for a typed lexical; set the
 name's stash to that value.
 If C<ourstash> is valid, it's an our lexical, set the name's
 If C<typestash> is valid, the name is for a typed lexical; set the
 name's stash to that value.
 If C<ourstash> is valid, it's an our lexical, set the name's

-GvSTASH to that value
+SvOURSTASH to that value

 
 If fake, it means we're cloning an existing entry
 
 
 If fake, it means we're cloning an existing entry
 


@@ -327,25 +343,29 @@ If fake, it means we're cloning an existing entry
 */
 
 PADOFFSET
 */
 
 PADOFFSET

-Perl_pad_add_name(pTHX_ const char *name, HV* typestash, HV* ourstash, bool fake)
+Perl_pad_add_name(pTHX_ const char *name, HV* typestash, HV* ourstash, bool fake, bool state)

 {
 {

+    dVAR;

     const PADOFFSET offset = pad_alloc(OP_PADSV, SVs_PADMY);
     const PADOFFSET offset = pad_alloc(OP_PADSV, SVs_PADMY);

-    SV* const namesv = NEWSV(1102, 0);
+    SV* const namesv
+       = newSV_type((ourstash || typestash) ? SVt_PVMG : SVt_PVNV);

 
     ASSERT_CURPAD_ACTIVE("pad_add_name");
 
 
     ASSERT_CURPAD_ACTIVE("pad_add_name");
 

-
-    sv_upgrade(namesv, ourstash ? SVt_PVGV : typestash ? SVt_PVMG : SVt_PVNV);

     sv_setpv(namesv, name);
 
     if (typestash) {
     sv_setpv(namesv, name);
 
     if (typestash) {

-       SvFLAGS(namesv) |= SVpad_TYPED;
-       SvSTASH_set(namesv, (HV*)SvREFCNT_inc((SV*) typestash));
+       assert(SvTYPE(namesv) == SVt_PVMG);
+       SvPAD_TYPED_on(namesv);
+       SvSTASH_set(namesv, (HV*)SvREFCNT_inc_simple_NN((SV*)typestash));

     }
     if (ourstash) {
     }
     if (ourstash) {

-       SvFLAGS(namesv) |= SVpad_OUR;
-       GvSTASH(namesv) = ourstash;
-       Perl_sv_add_backref(aTHX_ (SV*)ourstash, namesv);
+       SvPAD_OUR_on(namesv);
+       SvOURSTASH_set(namesv, ourstash);
+       SvREFCNT_inc_simple_void_NN(ourstash);
+    }
+    else if (state) {
+       SvPAD_STATE_on(namesv);

     }
 
     av_store(PL_comppad_name, offset, namesv);
     }
 
     av_store(PL_comppad_name, offset, namesv);


@@ -356,8 +376,8 @@ Perl_pad_add_name(pTHX_ const char *name, HV* typestash, HV* ourstash, bool fake
     }
     else {
        /* not yet introduced */
     }
     else {
        /* not yet introduced */

-       SvNV_set(namesv, (NV)PAD_MAX);  /* min */
-       SvIV_set(namesv, 0);            /* max */
+       COP_SEQ_RANGE_LOW_set(namesv, PAD_MAX); /* min */
+       COP_SEQ_RANGE_HIGH_set(namesv, 0);              /* max */

 
        if (!PL_min_intro_pending)
            PL_min_intro_pending = offset;
 
        if (!PL_min_intro_pending)
            PL_min_intro_pending = offset;


@@ -386,21 +406,27 @@ Perl_pad_add_name(pTHX_ const char *name, HV* typestash, HV* ourstash, bool fake
 
 Allocate a new my or tmp pad entry. For a my, simply push a null SV onto
 the end of PL_comppad, but for a tmp, scan the pad from PL_padix upwards
 
 Allocate a new my or tmp pad entry. For a my, simply push a null SV onto
 the end of PL_comppad, but for a tmp, scan the pad from PL_padix upwards

-for a slot which has no name and and no active value.
+for a slot which has no name and no active value.

 
 =cut
 */
 
 /* XXX DAPM integrate alloc(), add_name() and add_anon(),
  * or at least rationalise ??? */
 
 =cut
 */
 
 /* XXX DAPM integrate alloc(), add_name() and add_anon(),
  * or at least rationalise ??? */

-
+/* And flag whether the incoming name is UTF8 or 8 bit?
+   Could do this either with the +ve/-ve hack of the HV code, or expanding
+   the flag bits. Either way, this makes proper Unicode safe pad support.
+   NWC
+*/

 
 PADOFFSET
 Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype)
 {
 
 PADOFFSET
 Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype)
 {

+    dVAR;

     SV *sv;
     I32 retval;
 
     SV *sv;
     I32 retval;
 

+    PERL_UNUSED_ARG(optype);

     ASSERT_CURPAD_ACTIVE("pad_alloc");
 
     if (AvARRAY(PL_comppad) != PL_curpad)
     ASSERT_CURPAD_ACTIVE("pad_alloc");
 
     if (AvARRAY(PL_comppad) != PL_curpad)


@@ -412,7 +438,7 @@ Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype)
        retval = AvFILLp(PL_comppad);
     }
     else {
        retval = AvFILLp(PL_comppad);
     }
     else {

-       SV ** const names = AvARRAY(PL_comppad_name);
+       SV * const * const names = AvARRAY(PL_comppad_name);

         const SSize_t names_fill = AvFILLp(PL_comppad_name);
        for (;;) {
            /*
         const SSize_t names_fill = AvFILLp(PL_comppad_name);
        for (;;) {
            /*


@@ -456,14 +482,14 @@ Add an anon code entry to the current compiling pad
 PADOFFSET
 Perl_pad_add_anon(pTHX_ SV* sv, OPCODE op_type)
 {
 PADOFFSET
 Perl_pad_add_anon(pTHX_ SV* sv, OPCODE op_type)
 {

+    dVAR;

     PADOFFSET ix;
     PADOFFSET ix;

-    SV* name;
-
-    name = NEWSV(1106, 0);
-    sv_upgrade(name, SVt_PVNV);
+    SV* const name = newSV_type(SVt_PVNV);
+    pad_peg("add_anon");

     sv_setpvn(name, "&", 1);
     sv_setpvn(name, "&", 1);

-    SvIV_set(name, -1);
-    SvNV_set(name, 1);
+    /* Are these two actually ever read? */
+    COP_SEQ_RANGE_HIGH_set(name, ~0);
+    COP_SEQ_RANGE_LOW_set(name, 1);

     ix = pad_alloc(op_type, SVs_PADMY);
     av_store(PL_comppad_name, ix, name);
     /* XXX DAPM use PL_curpad[] ? */
     ix = pad_alloc(op_type, SVs_PADMY);
     av_store(PL_comppad_name, ix, name);
     /* XXX DAPM use PL_curpad[] ? */


@@ -499,11 +525,12 @@ C<is_our> indicates that the name to check is an 'our' declaration
 void
 Perl_pad_check_dup(pTHX_ const char *name, bool is_our, const HV *ourstash)
 {
 void
 Perl_pad_check_dup(pTHX_ const char *name, bool is_our, const HV *ourstash)
 {

+    dVAR;

     SV         **svp;
     PADOFFSET  top, off;
 
     ASSERT_CURPAD_ACTIVE("pad_check_dup");
     SV         **svp;
     PADOFFSET  top, off;
 
     ASSERT_CURPAD_ACTIVE("pad_check_dup");

-    if (!ckWARN(WARN_MISC) || AvFILLp(PL_comppad_name) < 0)
+    if (AvFILLp(PL_comppad_name) < 0 || !ckWARN(WARN_MISC))

        return; /* nothing to check */
 
     svp = AvARRAY(PL_comppad_name);
        return; /* nothing to check */
 
     svp = AvARRAY(PL_comppad_name);


@@ -516,16 +543,16 @@ Perl_pad_check_dup(pTHX_ const char *name, bool is_our, const HV *ourstash)
        if (sv
            && sv != &PL_sv_undef
            && !SvFAKE(sv)
        if (sv
            && sv != &PL_sv_undef
            && !SvFAKE(sv)

-           && (SvIVX(sv) == PAD_MAX || SvIVX(sv) == 0)
-           && (!is_our
-               || ((SvFLAGS(sv) & SVpad_OUR) && GvSTASH(sv) == ourstash))
+           && (COP_SEQ_RANGE_HIGH(sv) == PAD_MAX || COP_SEQ_RANGE_HIGH(sv) == 0)

            && strEQ(name, SvPVX_const(sv)))
        {
            && strEQ(name, SvPVX_const(sv)))
        {

+           if (is_our && (SvPAD_OUR(sv)))
+               break; /* "our" masking "our" */

            Perl_warner(aTHX_ packWARN(WARN_MISC),
                "\"%s\" variable %s masks earlier declaration in same %s",
            Perl_warner(aTHX_ packWARN(WARN_MISC),
                "\"%s\" variable %s masks earlier declaration in same %s",

-               (is_our ? "our" : "my"),
+               (is_our ? "our" : PL_in_my == KEY_my ? "my" : "state"),

                name,
                name,

-               (SvIVX(sv) == PAD_MAX ? "scope" : "statement"));
+               (COP_SEQ_RANGE_HIGH(sv) == PAD_MAX ? "scope" : "statement"));

            --off;
            break;
        }
            --off;
            break;
        }


@@ -537,14 +564,15 @@ Perl_pad_check_dup(pTHX_ const char *name, bool is_our, const HV *ourstash)
            if (sv
                && sv != &PL_sv_undef
                && !SvFAKE(sv)
            if (sv
                && sv != &PL_sv_undef
                && !SvFAKE(sv)

-               && (SvIVX(sv) == PAD_MAX || SvIVX(sv) == 0)
-               && ((SvFLAGS(sv) & SVpad_OUR) && GvSTASH(sv) == ourstash)
+               && (COP_SEQ_RANGE_HIGH(sv) == PAD_MAX || COP_SEQ_RANGE_HIGH(sv) == 0)
+               && SvOURSTASH(sv) == ourstash

                && strEQ(name, SvPVX_const(sv)))
            {
                Perl_warner(aTHX_ packWARN(WARN_MISC),
                    "\"our\" variable %s redeclared", name);
                && strEQ(name, SvPVX_const(sv)))
            {
                Perl_warner(aTHX_ packWARN(WARN_MISC),
                    "\"our\" variable %s redeclared", name);

-               Perl_warner(aTHX_ packWARN(WARN_MISC),
-                   "\t(Did you mean \"local\" instead of \"our\"?)\n");
+               if ((I32)off <= PL_comppad_name_floor)
+                   Perl_warner(aTHX_ packWARN(WARN_MISC),
+                       "\t(Did you mean \"local\" instead of \"our\"?)\n");

                break;
            }
        } while ( off-- > 0 );
                break;
            }
        } while ( off-- > 0 );


@@ -567,15 +595,17 @@ Returns the offset in the current pad, or NOT_IN_PAD on failure.
 PADOFFSET
 Perl_pad_findmy(pTHX_ const char *name)
 {
 PADOFFSET
 Perl_pad_findmy(pTHX_ const char *name)
 {

+    dVAR;

     SV *out_sv;
     int out_flags;
     I32 offset;
     const AV *nameav;
     SV **name_svp;
 
     SV *out_sv;
     int out_flags;
     I32 offset;
     const AV *nameav;
     SV **name_svp;
 

-    offset =  pad_findlex(name, PL_compcv, PL_cop_seqmax, 1,
-               Null(SV**), &out_sv, &out_flags);
-    if (offset != NOT_IN_PAD) 
+    pad_peg("pad_findmy");
+    offset = pad_findlex(name, PL_compcv, PL_cop_seqmax, 1,
+               NULL, &out_sv, &out_flags);
+    if ((PADOFFSET)offset != NOT_IN_PAD) 

        return offset;
 
     /* look for an our that's being introduced; this allows
        return offset;
 
     /* look for an our that's being introduced; this allows


@@ -585,12 +615,12 @@ Perl_pad_findmy(pTHX_ const char *name)
     nameav = (AV*)AvARRAY(CvPADLIST(PL_compcv))[0];
     name_svp = AvARRAY(nameav);
     for (offset = AvFILLp(nameav); offset > 0; offset--) {
     nameav = (AV*)AvARRAY(CvPADLIST(PL_compcv))[0];
     name_svp = AvARRAY(nameav);
     for (offset = AvFILLp(nameav); offset > 0; offset--) {

-        const SV *namesv = name_svp[offset];
+        const SV * const namesv = name_svp[offset];

        if (namesv && namesv != &PL_sv_undef
            && !SvFAKE(namesv)
        if (namesv && namesv != &PL_sv_undef
            && !SvFAKE(namesv)

-           && (SvFLAGS(namesv) & SVpad_OUR)
+           && (SvPAD_OUR(namesv))

            && strEQ(SvPVX_const(namesv), name)
            && strEQ(SvPVX_const(namesv), name)

-           && U_32(SvNVX(namesv)) == PAD_MAX /* min */
+           && COP_SEQ_RANGE_LOW(namesv) == PAD_MAX /* min */

        )
            return offset;
     }
        )
            return offset;
     }


@@ -605,10 +635,11 @@ Perl_pad_findmy(pTHX_ const char *name)
 PADOFFSET
 Perl_find_rundefsvoffset(pTHX)
 {
 PADOFFSET
 Perl_find_rundefsvoffset(pTHX)
 {

+    dVAR;

     SV *out_sv;
     int out_flags;
     return pad_findlex("$_", find_runcv(NULL), PL_curcop->cop_seq, 1,
     SV *out_sv;
     int out_flags;
     return pad_findlex("$_", find_runcv(NULL), PL_curcop->cop_seq, 1,

-           Null(SV**), &out_sv, &out_flags);
+           NULL, &out_sv, &out_flags);

 }
 
 /*
 }
 
 /*


@@ -628,17 +659,12 @@ associated with the IVX field of a fake namesv.
 
 Note that pad_findlex() is recursive; it recurses up the chain of CVs,
 then comes back down, adding fake entries as it goes. It has to be this way
 
 Note that pad_findlex() is recursive; it recurses up the chain of CVs,
 then comes back down, adding fake entries as it goes. It has to be this way

-because fake namesvs in anon protoypes have to store in NVX the index into
+because fake namesvs in anon protoypes have to store in xlow the index into

 the parent pad.
 
 =cut
 */
 
 the parent pad.
 
 =cut
 */
 

-/* Flags set in the SvIVX field of FAKE namesvs */
-
-#define PAD_FAKELEX_ANON   1 /* the lex is declared in an ANON, or ... */
-#define PAD_FAKELEX_MULTI  2 /* the lex can be instantiated multiple times */
-

 /* the CV has finished being compiled. This is not a sufficient test for
  * all CVs (eg XSUBs), but suffices for the CVs found in a lexical chain */
 #define CvCOMPILED(cv) CvROOT(cv)
 /* the CV has finished being compiled. This is not a sufficient test for
  * all CVs (eg XSUBs), but suffices for the CVs found in a lexical chain */
 #define CvCOMPILED(cv) CvROOT(cv)


@@ -651,10 +677,11 @@ STATIC PADOFFSET
 S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
        SV** out_capture, SV** out_name_sv, int *out_flags)
 {
 S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
        SV** out_capture, SV** out_name_sv, int *out_flags)
 {

+    dVAR;

     I32 offset, new_offset;
     SV *new_capture;
     SV **new_capturep;
     I32 offset, new_offset;
     SV *new_capture;
     SV **new_capturep;

-    const AV *padlist = CvPADLIST(cv);
+    const AV * const padlist = CvPADLIST(cv);

 
     *out_flags = 0;
 
 
     *out_flags = 0;
 


@@ -666,18 +693,18 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
 
     if (padlist) { /* not an undef CV */
        I32 fake_offset = 0;
 
     if (padlist) { /* not an undef CV */
        I32 fake_offset = 0;

-        const AV *nameav = (AV*)AvARRAY(padlist)[0];
-       SV **name_svp = AvARRAY(nameav);
+        const AV * const nameav = (AV*)AvARRAY(padlist)[0];
+       SV * const * const name_svp = AvARRAY(nameav);

 
        for (offset = AvFILLp(nameav); offset > 0; offset--) {
 
        for (offset = AvFILLp(nameav); offset > 0; offset--) {

-            const SV *namesv = name_svp[offset];
+            const SV * const namesv = name_svp[offset];

            if (namesv && namesv != &PL_sv_undef
                    && strEQ(SvPVX_const(namesv), name))
            {
                if (SvFAKE(namesv))
                    fake_offset = offset; /* in case we don't find a real one */
            if (namesv && namesv != &PL_sv_undef
                    && strEQ(SvPVX_const(namesv), name))
            {
                if (SvFAKE(namesv))
                    fake_offset = offset; /* in case we don't find a real one */

-               else if (  seq >  U_32(SvNVX(namesv))   /* min */
-                       && seq <= (U32)SvIVX(namesv))   /* max */
+               else if (  seq >  COP_SEQ_RANGE_LOW(namesv)     /* min */
+                       && seq <= COP_SEQ_RANGE_HIGH(namesv))   /* max */

                    break;
            }
        }
                    break;
            }
        }


@@ -700,18 +727,19 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
                                ? PAD_FAKELEX_MULTI : 0;
 
                DEBUG_Xv(PerlIO_printf(Perl_debug_log,
                                ? PAD_FAKELEX_MULTI : 0;
 
                DEBUG_Xv(PerlIO_printf(Perl_debug_log,

-                   "Pad findlex cv=0x%"UVxf" matched: offset=%ld (%ld,%ld)\n",
-                   PTR2UV(cv), (long)offset, (long)U_32(SvNVX(*out_name_sv)),
-                   (long)SvIVX(*out_name_sv)));
+                   "Pad findlex cv=0x%"UVxf" matched: offset=%ld (%lu,%lu)\n",
+                   PTR2UV(cv), (long)offset,
+                   (unsigned long)COP_SEQ_RANGE_LOW(*out_name_sv),
+                   (unsigned long)COP_SEQ_RANGE_HIGH(*out_name_sv)));

            }
            else { /* fake match */
                offset = fake_offset;
                *out_name_sv = name_svp[offset]; /* return the namesv */
            }
            else { /* fake match */
                offset = fake_offset;
                *out_name_sv = name_svp[offset]; /* return the namesv */

-               *out_flags = SvIVX(*out_name_sv);
+               *out_flags = PARENT_FAKELEX_FLAGS(*out_name_sv);

                DEBUG_Xv(PerlIO_printf(Perl_debug_log,
                    "Pad findlex cv=0x%"UVxf" matched: offset=%ld flags=0x%lx index=%lu\n",
                    PTR2UV(cv), (long)offset, (unsigned long)*out_flags,
                DEBUG_Xv(PerlIO_printf(Perl_debug_log,
                    "Pad findlex cv=0x%"UVxf" matched: offset=%ld flags=0x%lx index=%lu\n",
                    PTR2UV(cv), (long)offset, (unsigned long)*out_flags,

-                       (unsigned long)SvNVX(*out_name_sv) 
+                   (unsigned long) PARENT_PAD_INDEX(*out_name_sv) 

                ));
            }
 
                ));
            }
 


@@ -720,8 +748,8 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
            if (out_capture) {
 
                /* our ? */
            if (out_capture) {
 
                /* our ? */

-               if ((SvFLAGS(*out_name_sv) & SVpad_OUR)) {
-                   *out_capture = Nullsv;
+               if (SvPAD_OUR(*out_name_sv)) {
+                   *out_capture = NULL;

                    return offset;
                }
 
                    return offset;
                }
 


@@ -733,7 +761,7 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
                    if (warn && ckWARN(WARN_CLOSURE))
                        Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
                            "Variable \"%s\" is not available", name);
                    if (warn && ckWARN(WARN_CLOSURE))
                        Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
                            "Variable \"%s\" is not available", name);

-                   *out_capture = Nullsv;
+                   *out_capture = NULL;

                }
 
                /* real value */
                }
 
                /* real value */


@@ -755,7 +783,8 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
                            "Pad findlex cv=0x%"UVxf" chasing lex in outer pad\n",
                            PTR2UV(cv)));
                        n = *out_name_sv;
                            "Pad findlex cv=0x%"UVxf" chasing lex in outer pad\n",
                            PTR2UV(cv)));
                        n = *out_name_sv;

-                       pad_findlex(name, CvOUTSIDE(cv), CvOUTSIDE_SEQ(cv),
+                       (void) pad_findlex(name, CvOUTSIDE(cv),
+                           CvOUTSIDE_SEQ(cv),

                            newwarn, out_capture, out_name_sv, out_flags);
                        *out_name_sv = n;
                        return offset;
                            newwarn, out_capture, out_name_sv, out_flags);
                        *out_name_sv = n;
                        return offset;


@@ -771,7 +800,7 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
                        if (ckWARN(WARN_CLOSURE))
                            Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
                                "Variable \"%s\" is not available", name);
                        if (ckWARN(WARN_CLOSURE))
                            Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
                                "Variable \"%s\" is not available", name);

-                       *out_capture = Nullsv;
+                       *out_capture = NULL;

                    }
                }
                if (!*out_capture) {
                    }
                }
                if (!*out_capture) {


@@ -792,17 +821,17 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
 
     if (!CvOUTSIDE(cv))
        return NOT_IN_PAD;
 
     if (!CvOUTSIDE(cv))
        return NOT_IN_PAD;

-    
+

     /* out_capture non-null means caller wants us to capture lex; in
      * addition we capture ourselves unless it's an ANON/format */
     new_capturep = out_capture ? out_capture :
     /* out_capture non-null means caller wants us to capture lex; in
      * addition we capture ourselves unless it's an ANON/format */
     new_capturep = out_capture ? out_capture :

-               CvLATE(cv) ? Null(SV**) : &new_capture;
+               CvLATE(cv) ? NULL : &new_capture;

 
     offset = pad_findlex(name, CvOUTSIDE(cv), CvOUTSIDE_SEQ(cv), 1,
                new_capturep, out_name_sv, out_flags);
 
     offset = pad_findlex(name, CvOUTSIDE(cv), CvOUTSIDE_SEQ(cv), 1,
                new_capturep, out_name_sv, out_flags);

-    if (offset == NOT_IN_PAD)
+    if ((PADOFFSET)offset == NOT_IN_PAD)

        return NOT_IN_PAD;
        return NOT_IN_PAD;

-    
+

     /* found in an outer CV. Add appropriate fake entry to this pad */
 
     /* don't add new fake entries (via eval) to CVs that we have already
     /* found in an outer CV. Add appropriate fake entry to this pad */
 
     /* don't add new fake entries (via eval) to CVs that we have already


@@ -820,23 +849,23 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
 
        new_offset = pad_add_name(
            SvPVX_const(*out_name_sv),
 
        new_offset = pad_add_name(
            SvPVX_const(*out_name_sv),

-           (SvFLAGS(*out_name_sv) & SVpad_TYPED)
-                   ? SvSTASH(*out_name_sv) : Nullhv,
-           (SvFLAGS(*out_name_sv) & SVpad_OUR)
-                   ? GvSTASH(*out_name_sv) : Nullhv,
-           1  /* fake */
+           SvPAD_TYPED(*out_name_sv)
+                   ? SvSTASH(*out_name_sv) : NULL,
+           SvOURSTASH(*out_name_sv),
+           1,  /* fake */
+           0   /* not a state variable */

        );
 
        new_namesv = AvARRAY(PL_comppad_name)[new_offset];
        );
 
        new_namesv = AvARRAY(PL_comppad_name)[new_offset];

-       SvIV_set(new_namesv, *out_flags);
+       PARENT_FAKELEX_FLAGS_set(new_namesv, *out_flags);

 
 

-       SvNV_set(new_namesv, (NV)0);
-       if (SvFLAGS(new_namesv) & SVpad_OUR) {
-          /* do nothing */
+       PARENT_PAD_INDEX_set(new_namesv, 0);
+       if (SvPAD_OUR(new_namesv)) {
+           NOOP;   /* do nothing */

        }
        else if (CvLATE(cv)) {
            /* delayed creation - just note the offset within parent pad */
        }
        else if (CvLATE(cv)) {
            /* delayed creation - just note the offset within parent pad */

-           SvNV_set(new_namesv, (NV)offset);
+           PARENT_PAD_INDEX_set(new_namesv, offset);

            CvCLONE_on(cv);
        }
        else {
            CvCLONE_on(cv);
        }
        else {


@@ -847,16 +876,17 @@ S_pad_findlex(pTHX_ const char *name, const CV* cv, U32 seq, int warn,
                PTR2UV(cv), PTR2UV(*new_capturep), (long)new_offset));
        }
        *out_name_sv = new_namesv;
                PTR2UV(cv), PTR2UV(*new_capturep), (long)new_offset));
        }
        *out_name_sv = new_namesv;

-       *out_flags = SvIVX(new_namesv);
+       *out_flags = PARENT_FAKELEX_FLAGS(new_namesv);

 
        PL_comppad_name = ocomppad_name;
        PL_comppad = ocomppad;
 
        PL_comppad_name = ocomppad_name;
        PL_comppad = ocomppad;

-       PL_curpad = ocomppad ? AvARRAY(ocomppad) : Null(SV **);
+       PL_curpad = ocomppad ? AvARRAY(ocomppad) : NULL;

     }
     return new_offset;
 }
 
     }
     return new_offset;
 }
 

-               
+
+#ifdef DEBUGGING

 /*
 =for apidoc pad_sv
 
 /*
 =for apidoc pad_sv
 


@@ -870,6 +900,7 @@ Use macro PAD_SV instead of calling this function directly.
 SV *
 Perl_pad_sv(pTHX_ PADOFFSET po)
 {
 SV *
 Perl_pad_sv(pTHX_ PADOFFSET po)
 {

+    dVAR;

     ASSERT_CURPAD_ACTIVE("pad_sv");
 
     if (!po)
     ASSERT_CURPAD_ACTIVE("pad_sv");
 
     if (!po)


@@ -891,10 +922,10 @@ Use the macro PAD_SETSV() rather than calling this function directly.
 =cut
 */
 
 =cut
 */
 

-#ifdef DEBUGGING

 void
 Perl_pad_setsv(pTHX_ PADOFFSET po, SV* sv)
 {
 void
 Perl_pad_setsv(pTHX_ PADOFFSET po, SV* sv)
 {

+    dVAR;

     ASSERT_CURPAD_ACTIVE("pad_setsv");
 
     DEBUG_X(PerlIO_printf(Perl_debug_log,
     ASSERT_CURPAD_ACTIVE("pad_setsv");
 
     DEBUG_X(PerlIO_printf(Perl_debug_log,


@@ -924,6 +955,7 @@ Update the pad compilation state variables on entry to a new block
 void
 Perl_pad_block_start(pTHX_ int full)
 {
 void
 Perl_pad_block_start(pTHX_ int full)
 {

+    dVAR;

     ASSERT_CURPAD_ACTIVE("pad_block_start");
     SAVEI32(PL_comppad_name_floor);
     PL_comppad_name_floor = AvFILLp(PL_comppad_name);
     ASSERT_CURPAD_ACTIVE("pad_block_start");
     SAVEI32(PL_comppad_name_floor);
     PL_comppad_name_floor = AvFILLp(PL_comppad_name);


@@ -952,6 +984,7 @@ Perl_pad_block_start(pTHX_ int full)
 U32
 Perl_intro_my(pTHX)
 {
 U32
 Perl_intro_my(pTHX)
 {

+    dVAR;

     SV **svp;
     I32 i;
 
     SV **svp;
     I32 i;
 


@@ -963,13 +996,14 @@ Perl_intro_my(pTHX)
     for (i = PL_min_intro_pending; i <= PL_max_intro_pending; i++) {
        SV * const sv = svp[i];
 
     for (i = PL_min_intro_pending; i <= PL_max_intro_pending; i++) {
        SV * const sv = svp[i];
 

-       if (sv && sv != &PL_sv_undef && !SvFAKE(sv) && !SvIVX(sv)) {
-           SvIV_set(sv, PAD_MAX);      /* Don't know scope end yet. */
-           SvNV_set(sv, (NV)PL_cop_seqmax);
+       if (sv && sv != &PL_sv_undef && !SvFAKE(sv) && !COP_SEQ_RANGE_HIGH(sv)) {
+           COP_SEQ_RANGE_HIGH_set(sv, PAD_MAX);        /* Don't know scope end yet. */
+           COP_SEQ_RANGE_LOW_set(sv, PL_cop_seqmax);

            DEBUG_Xv(PerlIO_printf(Perl_debug_log,
            DEBUG_Xv(PerlIO_printf(Perl_debug_log,

-               "Pad intromy: %ld \"%s\", (%ld,%ld)\n",
+               "Pad intromy: %ld \"%s\", (%lu,%lu)\n",

                (long)i, SvPVX_const(sv),
                (long)i, SvPVX_const(sv),

-               (long)U_32(SvNVX(sv)), (long)SvIVX(sv))
+               (unsigned long)COP_SEQ_RANGE_LOW(sv),
+               (unsigned long)COP_SEQ_RANGE_HIGH(sv))

            );
        }
     }
            );
        }
     }


@@ -993,8 +1027,9 @@ lexicals in this scope and warn of any lexicals that never got introduced.
 void
 Perl_pad_leavemy(pTHX)
 {
 void
 Perl_pad_leavemy(pTHX)
 {

+    dVAR;

     I32 off;
     I32 off;

-    SV ** const svp = AvARRAY(PL_comppad_name);
+    SV * const * const svp = AvARRAY(PL_comppad_name);

 
     PL_pad_reset_pending = FALSE;
 
 
     PL_pad_reset_pending = FALSE;
 


@@ -1005,18 +1040,20 @@ Perl_pad_leavemy(pTHX)
            if (sv && sv != &PL_sv_undef
                    && !SvFAKE(sv) && ckWARN_d(WARN_INTERNAL))
                Perl_warner(aTHX_ packWARN(WARN_INTERNAL),
            if (sv && sv != &PL_sv_undef
                    && !SvFAKE(sv) && ckWARN_d(WARN_INTERNAL))
                Perl_warner(aTHX_ packWARN(WARN_INTERNAL),

-                                       "%"SVf" never introduced", sv);
+                           "%"SVf" never introduced",
+                           SVfARG(sv));

        }
     }
     /* "Deintroduce" my variables that are leaving with this scope. */
     for (off = AvFILLp(PL_comppad_name); off > PL_comppad_name_fill; off--) {
        const SV * const sv = svp[off];
        }
     }
     /* "Deintroduce" my variables that are leaving with this scope. */
     for (off = AvFILLp(PL_comppad_name); off > PL_comppad_name_fill; off--) {
        const SV * const sv = svp[off];

-       if (sv && sv != &PL_sv_undef && !SvFAKE(sv) && SvIVX(sv) == PAD_MAX) {
-           SvIV_set(sv, PL_cop_seqmax);
+       if (sv && sv != &PL_sv_undef && !SvFAKE(sv) && COP_SEQ_RANGE_HIGH(sv) == PAD_MAX) {
+           COP_SEQ_RANGE_HIGH_set(sv, PL_cop_seqmax);

            DEBUG_Xv(PerlIO_printf(Perl_debug_log,
            DEBUG_Xv(PerlIO_printf(Perl_debug_log,

-               "Pad leavemy: %ld \"%s\", (%ld,%ld)\n",
+               "Pad leavemy: %ld \"%s\", (%lu,%lu)\n",

                (long)off, SvPVX_const(sv),
                (long)off, SvPVX_const(sv),

-               (long)U_32(SvNVX(sv)), (long)SvIVX(sv))
+               (unsigned long)COP_SEQ_RANGE_LOW(sv),
+               (unsigned long)COP_SEQ_RANGE_HIGH(sv))

            );
        }
     }
            );
        }
     }


@@ -1038,6 +1075,7 @@ new one.
 void
 Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust)
 {
 void
 Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust)
 {

+    dVAR;

     ASSERT_CURPAD_LEGAL("pad_swipe");
     if (!PL_curpad)
        return;
     ASSERT_CURPAD_LEGAL("pad_swipe");
     if (!PL_curpad)
        return;


@@ -1055,8 +1093,15 @@ Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust)
     if (refadjust)
        SvREFCNT_dec(PL_curpad[po]);
 
     if (refadjust)
        SvREFCNT_dec(PL_curpad[po]);
 

-    PL_curpad[po] = NEWSV(1107,0);
+
+    /* if pad tmps aren't shared between ops, then there's no need to
+     * create a new tmp when an existing op is freed */
+#ifdef USE_BROKEN_PAD_RESET
+    PL_curpad[po] = newSV(0);

     SvPADTMP_on(PL_curpad[po]);
     SvPADTMP_on(PL_curpad[po]);

+#else
+    PL_curpad[po] = &PL_sv_undef;
+#endif

     if ((I32)po < PL_padix)
        PL_padix = po - 1;
 }
     if ((I32)po < PL_padix)
        PL_padix = po - 1;
 }


@@ -1079,6 +1124,7 @@ Mark all the current temporaries for reuse
 void
 Perl_pad_reset(pTHX)
 {
 void
 Perl_pad_reset(pTHX)
 {

+    dVAR;

 #ifdef USE_BROKEN_PAD_RESET
     if (AvARRAY(PL_comppad) != PL_curpad)
        Perl_croak(aTHX_ "panic: pad_reset curpad");
 #ifdef USE_BROKEN_PAD_RESET
     if (AvARRAY(PL_comppad) != PL_curpad)
        Perl_croak(aTHX_ "panic: pad_reset curpad");


@@ -1150,10 +1196,10 @@ Perl_pad_tidy(pTHX_ padtidy_type type)
 
     /* extend curpad to match namepad */
     if (AvFILLp(PL_comppad_name) < AvFILLp(PL_comppad))
 
     /* extend curpad to match namepad */
     if (AvFILLp(PL_comppad_name) < AvFILLp(PL_comppad))

-       av_store(PL_comppad_name, AvFILLp(PL_comppad), Nullsv);
+       av_store(PL_comppad_name, AvFILLp(PL_comppad), NULL);

 
     if (type == padtidy_SUBCLONE) {
 
     if (type == padtidy_SUBCLONE) {

-       SV ** const namep = AvARRAY(PL_comppad_name);
+       SV * const * const namep = AvARRAY(PL_comppad_name);

        PADOFFSET ix;
 
        for (ix = AvFILLp(PL_comppad); ix > 0; ix--) {
        PADOFFSET ix;
 
        for (ix = AvFILLp(PL_comppad); ix > 0; ix--) {


@@ -1166,12 +1212,12 @@ Perl_pad_tidy(pTHX_ padtidy_type type)
             * pad are anonymous subs.
             * The rest are created anew during cloning.
             */
             * pad are anonymous subs.
             * The rest are created anew during cloning.
             */

-           if (!((namesv = namep[ix]) != Nullsv &&
+           if (!((namesv = namep[ix]) != NULL &&

                  namesv != &PL_sv_undef &&
                   *SvPVX_const(namesv) == '&'))
            {
                SvREFCNT_dec(PL_curpad[ix]);
                  namesv != &PL_sv_undef &&
                   *SvPVX_const(namesv) == '&'))
            {
                SvREFCNT_dec(PL_curpad[ix]);

-               PL_curpad[ix] = Nullsv;
+               PL_curpad[ix] = NULL;

            }
        }
     }
            }
        }
     }


@@ -1208,7 +1254,7 @@ Perl_pad_tidy(pTHX_ padtidy_type type)
 /*
 =for apidoc pad_free
 
 /*
 =for apidoc pad_free
 

-Free the SV at offet po in the current pad.
+Free the SV at offset po in the current pad.

 
 =cut
 */
 
 =cut
 */


@@ -1217,6 +1263,7 @@ Free the SV at offet po in the current pad.
 void
 Perl_pad_free(pTHX_ PADOFFSET po)
 {
 void
 Perl_pad_free(pTHX_ PADOFFSET po)
 {

+    dVAR;

     ASSERT_CURPAD_LEGAL("pad_free");
     if (!PL_curpad)
        return;
     ASSERT_CURPAD_LEGAL("pad_free");
     if (!PL_curpad)
        return;


@@ -1261,6 +1308,7 @@ Dump the contents of a padlist
 void
 Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full)
 {
 void
 Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full)
 {

+    dVAR;

     const AV *pad_name;
     const AV *pad;
     SV **pname;
     const AV *pad_name;
     const AV *pad;
     SV **pname;


@@ -1282,7 +1330,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full)
     for (ix = 1; ix <= AvFILLp(pad_name); ix++) {
         const SV *namesv = pname[ix];
        if (namesv && namesv == &PL_sv_undef) {
     for (ix = 1; ix <= AvFILLp(pad_name); ix++) {
         const SV *namesv = pname[ix];
        if (namesv && namesv == &PL_sv_undef) {

-           namesv = Nullsv;
+           namesv = NULL;

        }
        if (namesv) {
            if (SvFAKE(namesv))
        }
        if (namesv) {
            if (SvFAKE(namesv))


@@ -1292,18 +1340,18 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full)
                    PTR2UV(ppad[ix]),
                    (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0),
                    SvPVX_const(namesv),
                    PTR2UV(ppad[ix]),
                    (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0),
                    SvPVX_const(namesv),

-                   (unsigned long)SvIVX(namesv),
-                   (unsigned long)SvNVX(namesv)
+                   (unsigned long)PARENT_FAKELEX_FLAGS(namesv),
+                   (unsigned long)PARENT_PAD_INDEX(namesv)

 
                );
            else
                Perl_dump_indent(aTHX_ level+1, file,
 
                );
            else
                Perl_dump_indent(aTHX_ level+1, file,

-                   "%2d. 0x%"UVxf"<%lu> (%ld,%ld) \"%s\"\n",
+                   "%2d. 0x%"UVxf"<%lu> (%lu,%lu) \"%s\"\n",

                    (int) ix,
                    PTR2UV(ppad[ix]),
                    (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0),
                    (int) ix,
                    PTR2UV(ppad[ix]),
                    (unsigned long) (ppad[ix] ? SvREFCNT(ppad[ix]) : 0),

-                   (long)U_32(SvNVX(namesv)),
-                   (long)SvIVX(namesv),
+                   (unsigned long)COP_SEQ_RANGE_LOW(namesv),
+                   (unsigned long)COP_SEQ_RANGE_HIGH(namesv),

                    SvPVX_const(namesv)
                );
        }
                    SvPVX_const(namesv)
                );
        }


@@ -1332,6 +1380,7 @@ dump the contents of a CV
 STATIC void
 S_cv_dump(pTHX_ const CV *cv, const char *title)
 {
 STATIC void
 S_cv_dump(pTHX_ const CV *cv, const char *title)
 {

+    dVAR;

     const CV * const outside = CvOUTSIDE(cv);
     AV* const padlist = CvPADLIST(cv);
 
     const CV * const outside = CvOUTSIDE(cv);
     AV* const padlist = CvPADLIST(cv);
 


@@ -1406,14 +1455,13 @@ Perl_cv_clone(pTHX_ CV *proto)
     ENTER;
     SAVESPTR(PL_compcv);
 
     ENTER;
     SAVESPTR(PL_compcv);
 

-    cv = PL_compcv = (CV*)NEWSV(1104, 0);
-    sv_upgrade((SV *)cv, SvTYPE(proto));
+    cv = PL_compcv = (CV*)newSV_type(SvTYPE(proto));

     CvFLAGS(cv) = CvFLAGS(proto) & ~(CVf_CLONE|CVf_WEAKOUTSIDE);
     CvCLONED_on(cv);
 
 #ifdef USE_ITHREADS
     CvFLAGS(cv) = CvFLAGS(proto) & ~(CVf_CLONE|CVf_WEAKOUTSIDE);
     CvCLONED_on(cv);
 
 #ifdef USE_ITHREADS

-    CvFILE(cv)         = CvXSUB(proto) ? CvFILE(proto)
-                                       : savepv(CvFILE(proto));
+    CvFILE(cv)         = CvISXSUB(proto) ? CvFILE(proto)
+                                         : savepv(CvFILE(proto));

 #else
     CvFILE(cv)         = CvFILE(proto);
 #endif
 #else
     CvFILE(cv)         = CvFILE(proto);
 #endif


@@ -1423,7 +1471,7 @@ Perl_cv_clone(pTHX_ CV *proto)
     CvROOT(cv)         = OpREFCNT_inc(CvROOT(proto));
     OP_REFCNT_UNLOCK;
     CvSTART(cv)                = CvSTART(proto);
     CvROOT(cv)         = OpREFCNT_inc(CvROOT(proto));
     OP_REFCNT_UNLOCK;
     CvSTART(cv)                = CvSTART(proto);

-    CvOUTSIDE(cv)      = (CV*)SvREFCNT_inc(outside);
+    CvOUTSIDE(cv)      = (CV*)SvREFCNT_inc_simple(outside);

     CvOUTSIDE_SEQ(cv) = CvOUTSIDE_SEQ(proto);
 
     if (SvPOK(proto))
     CvOUTSIDE_SEQ(cv) = CvOUTSIDE_SEQ(proto);
 
     if (SvPOK(proto))


@@ -1440,22 +1488,22 @@ Perl_cv_clone(pTHX_ CV *proto)
     outpad = AvARRAY(AvARRAY(CvPADLIST(outside))[depth]);
 
     for (ix = fpad; ix > 0; ix--) {
     outpad = AvARRAY(AvARRAY(CvPADLIST(outside))[depth]);
 
     for (ix = fpad; ix > 0; ix--) {

-       SV* const namesv = (ix <= fname) ? pname[ix] : Nullsv;
-       SV *sv = Nullsv;
+       SV* const namesv = (ix <= fname) ? pname[ix] : NULL;
+       SV *sv = NULL;

        if (namesv && namesv != &PL_sv_undef) { /* lexical */
            if (SvFAKE(namesv)) {   /* lexical from outside? */
        if (namesv && namesv != &PL_sv_undef) { /* lexical */
            if (SvFAKE(namesv)) {   /* lexical from outside? */

-               sv = outpad[(I32)SvNVX(namesv)];
+               sv = outpad[PARENT_PAD_INDEX(namesv)];

                assert(sv);
                /* formats may have an inactive parent */
                if (SvTYPE(proto) == SVt_PVFM && SvPADSTALE(sv)) {
                    if (ckWARN(WARN_CLOSURE))
                        Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
                            "Variable \"%s\" is not available", SvPVX_const(namesv));
                assert(sv);
                /* formats may have an inactive parent */
                if (SvTYPE(proto) == SVt_PVFM && SvPADSTALE(sv)) {
                    if (ckWARN(WARN_CLOSURE))
                        Perl_warner(aTHX_ packWARN(WARN_CLOSURE),
                            "Variable \"%s\" is not available", SvPVX_const(namesv));

-                   sv = Nullsv;
+                   sv = NULL;

                }
                else {
                    assert(!SvPADSTALE(sv));
                }
                else {
                    assert(!SvPADSTALE(sv));

-                   sv = SvREFCNT_inc(sv);
+                   SvREFCNT_inc_simple_void_NN(sv);

                }
            }
            if (!sv) {
                }
            }
            if (!sv) {


@@ -1467,15 +1515,15 @@ Perl_cv_clone(pTHX_ CV *proto)
                 else if (sigil == '%')
                    sv = (SV*)newHV();
                else
                 else if (sigil == '%')
                    sv = (SV*)newHV();
                else

-                   sv = NEWSV(0, 0);
+                   sv = newSV(0);

                SvPADMY_on(sv);
            }
        }
        else if (IS_PADGV(ppad[ix]) || IS_PADCONST(ppad[ix])) {
                SvPADMY_on(sv);
            }
        }
        else if (IS_PADGV(ppad[ix]) || IS_PADCONST(ppad[ix])) {

-           sv = SvREFCNT_inc(ppad[ix]);
+           sv = SvREFCNT_inc_NN(ppad[ix]);

        }
        else {
        }
        else {

-           sv = NEWSV(0, 0);
+           sv = newSV(0);

            SvPADTMP_on(sv);
        }
        PL_curpad[ix] = sv;
            SvPADTMP_on(sv);
        }
        PL_curpad[ix] = sv;


@@ -1496,10 +1544,10 @@ Perl_cv_clone(pTHX_ CV *proto)
         * so try to grab the current const value, and if successful,
         * turn into a const sub:
         */
         * so try to grab the current const value, and if successful,
         * turn into a const sub:
         */

-       SV* const_sv = op_const_sv(CvSTART(cv), cv);
+       SV* const const_sv = op_const_sv(CvSTART(cv), cv);

        if (const_sv) {
            SvREFCNT_dec(cv);
        if (const_sv) {
            SvREFCNT_dec(cv);

-           cv = newCONSTSUB(CvSTASH(proto), 0, const_sv);
+           cv = newCONSTSUB(CvSTASH(proto), NULL, const_sv);

        }
        else {
            CvCONST_off(cv);
        }
        else {
            CvCONST_off(cv);


@@ -1523,17 +1571,20 @@ moved to a pre-existing CV struct.
 void
 Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv)
 {
 void
 Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv)
 {

+    dVAR;

     I32 ix;
     AV * const comppad_name = (AV*)AvARRAY(padlist)[0];
     AV * const comppad = (AV*)AvARRAY(padlist)[1];
     SV ** const namepad = AvARRAY(comppad_name);
     SV ** const curpad = AvARRAY(comppad);
     I32 ix;
     AV * const comppad_name = (AV*)AvARRAY(padlist)[0];
     AV * const comppad = (AV*)AvARRAY(padlist)[1];
     SV ** const namepad = AvARRAY(comppad_name);
     SV ** const curpad = AvARRAY(comppad);

+    PERL_UNUSED_ARG(old_cv);
+

     for (ix = AvFILLp(comppad_name); ix > 0; ix--) {
     for (ix = AvFILLp(comppad_name); ix > 0; ix--) {

-        const SV *namesv = namepad[ix];
+        const SV * const namesv = namepad[ix];

        if (namesv && namesv != &PL_sv_undef
            && *SvPVX_const(namesv) == '&')
        {
        if (namesv && namesv != &PL_sv_undef
            && *SvPVX_const(namesv) == '&')
        {

-           CV *innercv = (CV*)curpad[ix];
+           CV * const innercv = (CV*)curpad[ix];

            assert(CvWEAKOUTSIDE(innercv));
            assert(CvOUTSIDE(innercv) == old_cv);
            CvOUTSIDE(innercv) = new_cv;
            assert(CvWEAKOUTSIDE(innercv));
            assert(CvOUTSIDE(innercv) == old_cv);
            CvOUTSIDE(innercv) = new_cv;


@@ -1555,22 +1606,23 @@ the new pad an @_ in slot zero.
 void
 Perl_pad_push(pTHX_ PADLIST *padlist, int depth)
 {
 void
 Perl_pad_push(pTHX_ PADLIST *padlist, int depth)
 {

-    if (depth <= AvFILLp(padlist))
-       return;
-
-    {
-       SV** svp = AvARRAY(padlist);
-       AV *newpad = newAV();
-       SV **oldpad = AvARRAY(svp[depth-1]);
+    dVAR;
+    if (depth > AvFILLp(padlist)) {
+       SV** const svp = AvARRAY(padlist);
+       AV* const newpad = newAV();
+       SV** const oldpad = AvARRAY(svp[depth-1]);

        I32 ix = AvFILLp((AV*)svp[1]);
         const I32 names_fill = AvFILLp((AV*)svp[0]);
        I32 ix = AvFILLp((AV*)svp[1]);
         const I32 names_fill = AvFILLp((AV*)svp[0]);

-       SV** names = AvARRAY(svp[0]);
+       SV** const names = AvARRAY(svp[0]);

        AV *av;
 
        for ( ;ix > 0; ix--) {
            if (names_fill >= ix && names[ix] != &PL_sv_undef) {
                const char sigil = SvPVX_const(names[ix])[0];
        AV *av;
 
        for ( ;ix > 0; ix--) {
            if (names_fill >= ix && names[ix] != &PL_sv_undef) {
                const char sigil = SvPVX_const(names[ix])[0];

-               if ((SvFLAGS(names[ix]) & SVf_FAKE) || sigil == '&') {
+               if ((SvFLAGS(names[ix]) & SVf_FAKE)
+                       || (SvFLAGS(names[ix]) & SVpad_STATE)
+                       || sigil == '&')
+               {

                    /* outer lexical or anon code */
                    av_store(newpad, ix, SvREFCNT_inc(oldpad[ix]));
                }
                    /* outer lexical or anon code */
                    av_store(newpad, ix, SvREFCNT_inc(oldpad[ix]));
                }


@@ -1581,17 +1633,17 @@ Perl_pad_push(pTHX_ PADLIST *padlist, int depth)
                    else if (sigil == '%')
                        sv = (SV*)newHV();
                    else
                    else if (sigil == '%')
                        sv = (SV*)newHV();
                    else

-                       sv = NEWSV(0, 0);
+                       sv = newSV(0);

                    av_store(newpad, ix, sv);
                    SvPADMY_on(sv);
                }
            }
            else if (IS_PADGV(oldpad[ix]) || IS_PADCONST(oldpad[ix])) {
                    av_store(newpad, ix, sv);
                    SvPADMY_on(sv);
                }
            }
            else if (IS_PADGV(oldpad[ix]) || IS_PADCONST(oldpad[ix])) {

-               av_store(newpad, ix, SvREFCNT_inc(oldpad[ix]));
+               av_store(newpad, ix, SvREFCNT_inc_NN(oldpad[ix]));

            }
            else {
                /* save temporaries on recursion? */
            }
            else {
                /* save temporaries on recursion? */

-               SV *sv = NEWSV(0, 0);
+               SV * const sv = newSV(0);

                av_store(newpad, ix, sv);
                SvPADTMP_on(sv);
            }
                av_store(newpad, ix, sv);
                SvPADTMP_on(sv);
            }


@@ -1610,11 +1662,12 @@ Perl_pad_push(pTHX_ PADLIST *padlist, int depth)
 HV *
 Perl_pad_compname_type(pTHX_ const PADOFFSET po)
 {
 HV *
 Perl_pad_compname_type(pTHX_ const PADOFFSET po)
 {

-    SV** const av = av_fetch(PL_comppad_name, po, FALSE);
-    if ( SvFLAGS(*av) & SVpad_TYPED ) {
+    dVAR;
+    SV* const * const av = av_fetch(PL_comppad_name, po, FALSE);
+    if ( SvPAD_TYPED(*av) ) {

         return SvSTASH(*av);
     }
         return SvSTASH(*av);
     }

-    return Nullhv;
+    return NULL;

 }
 
 /*
 }
 
 /*