This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Promote v5.36 usage and feature bundles doc
[perl5.git] / scope.c
diff --git a/scope.c b/scope.c
index cea1500..17e5282 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -105,16 +105,25 @@ Perl_cxinc(pTHX)
     return cxstack_ix + 1;
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc push_scope
+
+Implements L<perlapi/C<ENTER>>
+
+=cut
+*/
+
 void
 Perl_push_scope(pTHX)
 {
     if (UNLIKELY(PL_scopestack_ix == PL_scopestack_max)) {
         const IV new_max = GROW(PL_scopestack_max);
-       Renew(PL_scopestack, new_max, I32);
+        Renew(PL_scopestack, new_max, I32);
 #ifdef DEBUGGING
-       Renew(PL_scopestack_name, new_max, const char*);
+        Renew(PL_scopestack_name, new_max, const char*);
 #endif
-       PL_scopestack_max = new_max;
+        PL_scopestack_max = new_max;
     }
 #ifdef DEBUGGING
     PL_scopestack_name[PL_scopestack_ix] = "unknown";
@@ -123,6 +132,15 @@ Perl_push_scope(pTHX)
 
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc pop_scope
+
+Implements L<perlapi/C<LEAVE>>
+
+=cut
+*/
+
 void
 Perl_pop_scope(pTHX)
 {
@@ -195,7 +213,7 @@ Perl_tmps_grow_p(pTHX_ SSize_t ix)
     SSize_t extend_to = ix;
 #ifndef STRESS_REALLOC
     if (ix - PL_tmps_max < 128)
-       extend_to += (PL_tmps_max < 512) ? 128 : 512;
+        extend_to += (PL_tmps_max < 512) ? 128 : 512;
 #endif
     Renew(PL_tmps_stack, extend_to + 1, SV*);
     PL_tmps_max = extend_to + 1;
@@ -209,17 +227,38 @@ Perl_free_tmps(pTHX)
     /* XXX should tmps_floor live in cxstack? */
     const SSize_t myfloor = PL_tmps_floor;
     while (PL_tmps_ix > myfloor) {      /* clean up after last statement */
-       SV* const sv = PL_tmps_stack[PL_tmps_ix--];
+        SV* const sv = PL_tmps_stack[PL_tmps_ix--];
 #ifdef PERL_POISON
-       PoisonWith(PL_tmps_stack + PL_tmps_ix + 1, 1, SV *, 0xAB);
+        PoisonWith(PL_tmps_stack + PL_tmps_ix + 1, 1, SV *, 0xAB);
 #endif
-       if (LIKELY(sv)) {
-           SvTEMP_off(sv);
-           SvREFCNT_dec_NN(sv);                /* note, can modify tmps_ix!!! */
-       }
+        if (LIKELY(sv)) {
+            SvTEMP_off(sv);
+            SvREFCNT_dec_NN(sv);               /* note, can modify tmps_ix!!! */
+        }
     }
 }
 
+/*
+=for apidoc save_scalar_at
+
+A helper function for localizing the SV referenced by C<*sptr>.
+
+If C<SAVEf_KEEPOLDELEM> is set in in C<flags>, the function returns the input
+scalar untouched.
+
+Otherwise it replaces C<*sptr> with a new C<undef> scalar, and returns that.
+The new scalar will have the old one's magic (if any) copied to it.
+If there is such magic, and C<SAVEf_SETMAGIC> is set in in C<flags>, 'set'
+magic will be processed on the new scalar.  If unset, 'set' magic will be
+skipped.  The latter typically means that assignment will soon follow (I<e.g.>,
+S<C<'local $x = $y'>>), and that will handle the magic.
+
+=for apidoc Amnh ||SAVEf_KEEPOLDELEM
+=for apidoc Amnh ||SAVEf_SETMAGIC
+
+=cut
+*/
+
 STATIC SV *
 S_save_scalar_at(pTHX_ SV **sptr, const U32 flags)
 {
@@ -232,7 +271,7 @@ S_save_scalar_at(pTHX_ SV **sptr, const U32 flags)
     if (flags & SAVEf_KEEPOLDELEM)
         sv = osv;
     else {
-        sv  = (*sptr = newSV(0));
+        sv  = (*sptr = newSV_type(SVt_NULL));
         if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv))
             mg_localize(osv, sv, cBOOL(flags & SAVEf_SETMAGIC));
     }
@@ -266,8 +305,17 @@ Perl_save_scalar(pTHX_ GV *gv)
     return save_scalar_at(sptr, SAVEf_SETMAGIC); /* XXX - FIXME - see #60360 */
 }
 
-/* Like save_sptr(), but also SvREFCNT_dec()s the new value.  Can be used to
- * restore a global SV to its prior contents, freeing new value. */
+/*
+=for apidoc save_generic_svref
+
+Implements C<SAVEGENERICSV>.
+
+Like save_sptr(), but also SvREFCNT_dec()s the new value.  Can be used to
+restore a global SV to its prior contents, freeing new value.
+
+=cut
+ */
+
 void
 Perl_save_generic_svref(pTHX_ SV **sptr)
 {
@@ -276,9 +324,19 @@ Perl_save_generic_svref(pTHX_ SV **sptr)
     save_pushptrptr(sptr, SvREFCNT_inc(*sptr), SAVEt_GENERIC_SVREF);
 }
 
-/* Like save_pptr(), but also Safefree()s the new value if it is different
- * from the old one.  Can be used to restore a global char* to its prior
- * contents, freeing new value. */
+/*
+=for apidoc_section $callback
+=for apidoc save_generic_pvref
+
+Implements C<SAVEGENERICPV>.
+
+Like save_pptr(), but also Safefree()s the new value if it is different
+from the old one.  Can be used to restore a global char* to its prior
+contents, freeing new value.
+
+=cut
+ */
+
 void
 Perl_save_generic_pvref(pTHX_ char **str)
 {
@@ -287,9 +345,19 @@ Perl_save_generic_pvref(pTHX_ char **str)
     save_pushptrptr(*str, str, SAVEt_GENERIC_PVREF);
 }
 
-/* Like save_generic_pvref(), but uses PerlMemShared_free() rather than Safefree().
- * Can be used to restore a shared global char* to its prior
- * contents, freeing new value. */
+/*
+=for apidoc_section $callback
+=for apidoc save_shared_pvref
+
+Implements C<SAVESHAREDPV>.
+
+Like save_generic_pvref(), but uses PerlMemShared_free() rather than Safefree().
+Can be used to restore a shared global char* to its prior
+contents, freeing new value.
+
+=cut
+ */
+
 void
 Perl_save_shared_pvref(pTHX_ char **str)
 {
@@ -298,7 +366,17 @@ Perl_save_shared_pvref(pTHX_ char **str)
     save_pushptrptr(str, *str, SAVEt_SHARED_PVREF);
 }
 
-/* set the SvFLAGS specified by mask to the values in val */
+
+/*
+=for apidoc_section $callback
+=for apidoc save_set_svflags
+
+Implements C<SAVESETSVFLAGS>.
+
+Set the SvFLAGS specified by mask to the values in val
+
+=cut
+ */
 
 void
 Perl_save_set_svflags(pTHX_ SV* sv, U32 mask, U32 val)
@@ -322,10 +400,10 @@ Perl_save_set_svflags(pTHX_ SV* sv, U32 mask, U32 val)
 
 Saves the current GP of gv on the save stack to be restored on scope exit.
 
-If empty is true, replace the GP with a new GP.
+If C<empty> is true, replace the GP with a new GP.
 
-If empty is false, mark gv with GVf_INTRO so the next reference
-assigned is localized, which is how C< local *foo = $someref; > works.
+If C<empty> is false, mark C<gv> with C<GVf_INTRO> so the next reference
+assigned is localized, which is how S<C< local *foo = $someref; >> works.
 
 =cut
 */
@@ -349,27 +427,27 @@ Perl_save_gp(pTHX_ GV *gv, I32 empty)
     save_pushptrptr(SvREFCNT_inc(gv), GvGP(gv), SAVEt_GP);
 
     if (empty) {
-       GP *gp = Perl_newGP(aTHX_ gv);
-       HV * const stash = GvSTASH(gv);
-       bool isa_changed = 0;
-
-       if (stash && HvENAME(stash)) {
-           if (memEQs(GvNAME(gv), GvNAMELEN(gv), "ISA"))
-               isa_changed = TRUE;
-           else if (GvCVu(gv))
-               /* taking a method out of circulation ("local")*/
+        GP *gp = Perl_newGP(aTHX_ gv);
+        HV * const stash = GvSTASH(gv);
+        bool isa_changed = 0;
+
+        if (stash && HvENAME(stash)) {
+            if (memEQs(GvNAME(gv), GvNAMELEN(gv), "ISA"))
+                isa_changed = TRUE;
+            else if (GvCVu(gv))
+                /* taking a method out of circulation ("local")*/
                 mro_method_changed_in(stash);
-       }
-       if (GvIOp(gv) && (IoFLAGS(GvIOp(gv)) & IOf_ARGV)) {
-           gp->gp_io = newIO();
-           IoFLAGS(gp->gp_io) |= IOf_ARGV|IOf_START;
-       }
-       GvGP_set(gv,gp);
-       if (isa_changed) mro_isa_changed_in(stash);
+        }
+        if (GvIOp(gv) && (IoFLAGS(GvIOp(gv)) & IOf_ARGV)) {
+            gp->gp_io = newIO();
+            IoFLAGS(gp->gp_io) |= IOf_ARGV|IOf_START;
+        }
+        GvGP_set(gv,gp);
+        if (isa_changed) mro_isa_changed_in(stash);
     }
     else {
-       gp_ref(GvGP(gv));
-       GvINTRO_on(gv);
+        gp_ref(GvGP(gv));
+        GvINTRO_on(gv);
     }
 }
 
@@ -382,13 +460,13 @@ Perl_save_ary(pTHX_ GV *gv)
     PERL_ARGS_ASSERT_SAVE_ARY;
 
     if (UNLIKELY(!AvREAL(oav) && AvREIFY(oav)))
-       av_reify(oav);
+        av_reify(oav);
     save_pushptrptr(SvREFCNT_inc_simple_NN(gv), oav, SAVEt_AV);
 
     GvAV(gv) = NULL;
     av = GvAVn(gv);
     if (UNLIKELY(SvMAGIC(oav)))
-       mg_localize(MUTABLE_SV(oav), MUTABLE_SV(av), TRUE);
+        mg_localize(MUTABLE_SV(oav), MUTABLE_SV(av), TRUE);
     return av;
 }
 
@@ -400,13 +478,13 @@ Perl_save_hash(pTHX_ GV *gv)
     PERL_ARGS_ASSERT_SAVE_HASH;
 
     save_pushptrptr(
-       SvREFCNT_inc_simple_NN(gv), (ohv = GvHVn(gv)), SAVEt_HV
+        SvREFCNT_inc_simple_NN(gv), (ohv = GvHVn(gv)), SAVEt_HV
     );
 
     GvHV(gv) = NULL;
     hv = GvHVn(gv);
     if (UNLIKELY(SvMAGIC(ohv)))
-       mg_localize(MUTABLE_SV(ohv), MUTABLE_SV(hv), TRUE);
+        mg_localize(MUTABLE_SV(ohv), MUTABLE_SV(hv), TRUE);
     return hv;
 }
 
@@ -418,8 +496,8 @@ Perl_save_item(pTHX_ SV *item)
     PERL_ARGS_ASSERT_SAVE_ITEM;
 
     save_pushptrptr(item, /* remember the pointer */
-                   sv,   /* remember the value */
-                   SAVEt_ITEM);
+                    sv,   /* remember the value */
+                    SAVEt_ITEM);
 }
 
 void
@@ -512,14 +590,22 @@ Perl_save_I32(pTHX_ I32 *intp)
 void
 Perl_save_strlen(pTHX_ STRLEN *ptr)
 {
+    const IV i = *ptr;
+    UV type = ((I32)((U32)i << SAVE_TIGHT_SHIFT) | SAVEt_STRLEN_SMALL);
+    int size = 2;
     dSS_ADD;
 
     PERL_ARGS_ASSERT_SAVE_STRLEN;
 
-    SS_ADD_IV(*ptr);
+    if (UNLIKELY((I32)(type >> SAVE_TIGHT_SHIFT) != i)) {
+        SS_ADD_IV(*ptr);
+        type = SAVEt_STRLEN;
+        size++;
+    }
+
     SS_ADD_PTR(ptr);
-    SS_ADD_UV(SAVEt_STRLEN);
-    SS_ADD_END(3);
+    SS_ADD_UV(type);
+    SS_ADD_END(size);
 }
 
 void
@@ -544,6 +630,15 @@ Perl_save_pptr(pTHX_ char **pptr)
     save_pushptrptr(*pptr, pptr, SAVEt_PPTR);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc save_vptr
+
+Implements C<SAVEVPTR>.
+
+=cut
+ */
+
 void
 Perl_save_vptr(pTHX_ void *ptr)
 {
@@ -560,6 +655,15 @@ Perl_save_sptr(pTHX_ SV **sptr)
     save_pushptrptr(*sptr, sptr, SAVEt_SPTR);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc save_padsv_and_mortalize
+
+Implements C<SAVEPADSVANDMORTALIZE>.
+
+=cut
+ */
+
 void
 Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off)
 {
@@ -589,6 +693,20 @@ Perl_save_aptr(pTHX_ AV **aptr)
     save_pushptrptr(*aptr, aptr, SAVEt_APTR);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc save_pushptr
+
+The refcnt of object C<ptr> will be decremented at the end of the current
+I<pseudo-block>.  C<type> gives the type of C<ptr>, expressed as one of the
+constants in F<scope.h> whose name begins with C<SAVEt_>.
+
+This is the underlying implementation of several macros, like
+C<SAVEFREESV>.
+
+=cut
+*/
+
 void
 Perl_save_pushptr(pTHX_ void *const ptr, const int type)
 {
@@ -609,8 +727,8 @@ Perl_save_clearsv(pTHX_ SV **svp)
     ASSERT_CURPAD_ACTIVE("save_clearsv");
     SvPADSTALE_off(*svp); /* mark lexical as active */
     if (UNLIKELY((offset_shifted >> SAVE_TIGHT_SHIFT) != offset)) {
-       Perl_croak(aTHX_ "panic: pad offset %" UVuf " out of range (%p-%p)",
-                  offset, svp, PL_curpad);
+        Perl_croak(aTHX_ "panic: pad offset %" UVuf " out of range (%p-%p)",
+                   offset, svp, PL_curpad);
     }
 
     {
@@ -628,6 +746,15 @@ Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen)
     save_pushptri32ptr(key, klen, SvREFCNT_inc_simple(hv), SAVEt_DELETE);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc save_hdelete
+
+Implements C<SAVEHDELETE>.
+
+=cut
+*/
+
 void
 Perl_save_hdelete(pTHX_ HV *hv, SV *keysv)
 {
@@ -643,6 +770,15 @@ Perl_save_hdelete(pTHX_ HV *hv, SV *keysv)
     save_pushptri32ptr(savepvn(key, len), klen, hv, SAVEt_DELETE);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc save_adelete
+
+Implements C<SAVEADELETE>.
+
+=cut
+*/
+
 void
 Perl_save_adelete(pTHX_ AV *av, SSize_t key)
 {
@@ -680,31 +816,40 @@ Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p)
     SS_ADD_END(3);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc save_hints
+
+Implements C<SAVEHINTS>.
+
+=cut
+ */
+
 void
 Perl_save_hints(pTHX)
 {
     COPHH *save_cophh = cophh_copy(CopHINTHASH_get(&PL_compiling));
     if (PL_hints & HINT_LOCALIZE_HH) {
-       HV *oldhh = GvHV(PL_hintgv);
+        HV *oldhh = GvHV(PL_hintgv);
         {
             dSS_ADD;
             SS_ADD_INT(PL_hints);
             SS_ADD_PTR(save_cophh);
             SS_ADD_PTR(oldhh);
-            SS_ADD_UV(SAVEt_HINTS_HH);
+            SS_ADD_UV(SAVEt_HINTS_HH | (PL_prevailing_version << 8));
             SS_ADD_END(4);
         }
-       GvHV(PL_hintgv) = NULL; /* in case copying dies */
-       GvHV(PL_hintgv) = hv_copy_hints_hv(oldhh);
+        GvHV(PL_hintgv) = NULL; /* in case copying dies */
+        GvHV(PL_hintgv) = hv_copy_hints_hv(oldhh);
         SAVEFEATUREBITS();
     } else {
-       save_pushi32ptr(PL_hints, save_cophh, SAVEt_HINTS);
+        save_pushi32ptr(PL_hints, save_cophh, SAVEt_HINTS | (PL_prevailing_version << 8));
     }
 }
 
 static void
 S_save_pushptri32ptr(pTHX_ void *const ptr1, const I32 i, void *const ptr2,
-                       const int type)
+                        const int type)
 {
     dSS_ADD;
     SS_ADD_PTR(ptr1);
@@ -714,9 +859,31 @@ S_save_pushptri32ptr(pTHX_ void *const ptr1, const I32 i, void *const ptr2,
     SS_ADD_END(4);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc      save_aelem
+=for apidoc_item save_aelem_flags
+
+These each arrange for the value of the array element C<av[idx]> to be restored
+at the end of the enclosing I<pseudo-block>.
+
+In C<save_aelem>, the SV at C**sptr> will be replaced by a new C<undef>
+scalar.  That scalar will inherit any magic from the original C<**sptr>,
+and any 'set' magic will be processed.
+
+In C<save_aelem_flags>, C<SAVEf_KEEPOLDELEM> being set in C<flags> causes
+the function to forgo all that:  the scalar at C<**sptr> is untouched.
+If C<SAVEf_KEEPOLDELEM> is not set, the SV at C**sptr> will be replaced by a
+new C<undef> scalar.  That scalar will inherit any magic from the original
+C<**sptr>.  Any 'set' magic will be processed if and only if C<SAVEf_SETMAGIC>
+is set in in C<flags>.
+
+=cut
+*/
+
 void
 Perl_save_aelem_flags(pTHX_ AV *av, SSize_t idx, SV **sptr,
-                           const U32 flags)
+                            const U32 flags)
 {
     dSS_ADD;
     SV *sv;
@@ -732,19 +899,41 @@ Perl_save_aelem_flags(pTHX_ AV *av, SSize_t idx, SV **sptr,
     /* The array needs to hold a reference count on its new element, so it
        must be AvREAL. */
     if (UNLIKELY(!AvREAL(av) && AvREIFY(av)))
-       av_reify(av);
+        av_reify(av);
     save_scalar_at(sptr, flags); /* XXX - FIXME - see #60360 */
     if (flags & SAVEf_KEEPOLDELEM)
-       return;
+        return;
     sv = *sptr;
     /* If we're localizing a tied array element, this new sv
      * won't actually be stored in the array - so it won't get
      * reaped when the localize ends. Ensure it gets reaped by
      * mortifying it instead. DAPM */
     if (UNLIKELY(SvTIED_mg((const SV *)av, PERL_MAGIC_tied)))
-       sv_2mortal(sv);
+        sv_2mortal(sv);
 }
 
+/*
+=for apidoc_section $callback
+=for apidoc      save_helem
+=for apidoc_item save_helem_flags
+
+These each arrange for the value of the hash element (in Perlish terms)
+C<$hv{key}]> to be restored at the end of the enclosing I<pseudo-block>.
+
+In C<save_helem>, the SV at C**sptr> will be replaced by a new C<undef>
+scalar.  That scalar will inherit any magic from the original C<**sptr>,
+and any 'set' magic will be processed.
+
+In C<save_helem_flags>, C<SAVEf_KEEPOLDELEM> being set in C<flags> causes
+the function to forgo all that:  the scalar at C<**sptr> is untouched.
+If C<SAVEf_KEEPOLDELEM> is not set, the SV at C**sptr> will be replaced by a
+new C<undef> scalar.  That scalar will inherit any magic from the original
+C<**sptr>.  Any 'set' magic will be processed if and only if C<SAVEf_SETMAGIC>
+is set in in C<flags>.
+
+=cut
+*/
+
 void
 Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags)
 {
@@ -763,14 +952,14 @@ Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags)
     }
     save_scalar_at(sptr, flags);
     if (flags & SAVEf_KEEPOLDELEM)
-       return;
+        return;
     sv = *sptr;
     /* If we're localizing a tied hash element, this new sv
      * won't actually be stored in the hash - so it won't get
      * reaped when the localize ends. Ensure it gets reaped by
      * mortifying it instead. DAPM */
     if (UNLIKELY(SvTIED_mg((const SV *)hv, PERL_MAGIC_tied)))
-       sv_2mortal(sv);
+        sv_2mortal(sv);
 }
 
 SV*
@@ -794,6 +983,15 @@ Perl_savetmps(pTHX)
     SS_ADD_END(2);
 }
 
+/*
+=for apidoc_section $stack
+=for apidoc save_alloc
+
+Implements L<perlapi/C<SSNEW>> and kin, which should be used instead of this
+function.
+
+=cut
+*/
 
 I32
 Perl_save_alloc(pTHX_ I32 size, I32 pad)
@@ -804,9 +1002,9 @@ Perl_save_alloc(pTHX_ I32 size, I32 pad)
     const UV elems_shifted = elems << SAVE_TIGHT_SHIFT;
 
     if (UNLIKELY((elems_shifted >> SAVE_TIGHT_SHIFT) != elems))
-       Perl_croak(aTHX_
+        Perl_croak(aTHX_
             "panic: save_alloc elems %" UVuf " out of range (%" IVdf "-%" IVdf ")",
-                  elems, (IV)size, (IV)pad);
+                   elems, (IV)size, (IV)pad);
 
     SSGROW(elems + 1);
 
@@ -840,6 +1038,7 @@ static const U8 arg_counts[] = {
     1, /* SAVEt_STACK_POS          */
     1, /* SAVEt_READONLY_OFF       */
     1, /* SAVEt_FREEPADNAME        */
+    1, /* SAVEt_STRLEN_SMALL       */
     2, /* SAVEt_AV                 */
     2, /* SAVEt_DESTRUCTOR         */
     2, /* SAVEt_DESTRUCTOR_X       */
@@ -875,6 +1074,15 @@ static const U8 arg_counts[] = {
 };
 
 
+/*
+=for apidoc_section $callback
+=for apidoc leave_scope
+
+Implements C<LEAVE_SCOPE> which you should use instead.
+
+=cut
+ */
+
 void
 Perl_leave_scope(pTHX_ I32 base)
 {
@@ -882,16 +1090,16 @@ Perl_leave_scope(pTHX_ I32 base)
     bool was = TAINT_get;
 
     if (UNLIKELY(base < -1))
-       Perl_croak(aTHX_ "panic: corrupt saved stack index %ld", (long) base);
+        Perl_croak(aTHX_ "panic: corrupt saved stack index %ld", (long) base);
     DEBUG_l(Perl_deb(aTHX_ "savestack: releasing items %ld -> %ld\n",
-                       (long)PL_savestack_ix, (long)base));
+                        (long)PL_savestack_ix, (long)base));
     while (PL_savestack_ix > base) {
-       UV uv;
-       U8 type;
+        UV uv;
+        U8 type;
         ANY *ap; /* arg pointer */
         ANY a0, a1, a2; /* up to 3 args */
 
-       TAINT_NOT;
+        TAINT_NOT;
 
         {
             U8  argcount;
@@ -905,34 +1113,34 @@ Perl_leave_scope(pTHX_ I32 base)
             ap -= argcount;
         }
 
-       switch (type) {
-       case SAVEt_ITEM:                        /* normal string */
+        switch (type) {
+        case SAVEt_ITEM:                       /* normal string */
             a0 = ap[0]; a1 = ap[1];
-           sv_replace(a0.any_sv, a1.any_sv);
+            sv_replace(a0.any_sv, a1.any_sv);
             if (UNLIKELY(SvSMAGICAL(a0.any_sv))) {
                 PL_localizing = 2;
                 mg_set(a0.any_sv);
                 PL_localizing = 0;
             }
-           break;
+            break;
 
-           /* This would be a mathom, but Perl_save_svref() calls a static
-              function, S_save_scalar_at(), so has to stay in this file.  */
-       case SAVEt_SVREF:                       /* scalar reference */
+            /* This would be a mathom, but Perl_save_svref() calls a static
+               function, S_save_scalar_at(), so has to stay in this file.  */
+        case SAVEt_SVREF:                      /* scalar reference */
             a0 = ap[0]; a1 = ap[1];
-           a2.any_svp = a0.any_svp;
-           a0.any_sv = NULL; /* what to refcnt_dec */
-           goto restore_sv;
+            a2.any_svp = a0.any_svp;
+            a0.any_sv = NULL; /* what to refcnt_dec */
+            goto restore_sv;
 
-       case SAVEt_SV:                          /* scalar reference */
+        case SAVEt_SV:                         /* scalar reference */
             a0 = ap[0]; a1 = ap[1];
-           a2.any_svp = &GvSV(a0.any_gv);
-       restore_sv:
+            a2.any_svp = &GvSV(a0.any_gv);
+        restore_sv:
         {
             /* do *a2.any_svp = a1 and free a0 */
-           SV * const sv = *a2.any_svp;
-           *a2.any_svp = a1.any_sv;
-           SvREFCNT_dec(sv);
+            SV * const sv = *a2.any_svp;
+            *a2.any_svp = a1.any_sv;
+            SvREFCNT_dec(sv);
             if (UNLIKELY(SvSMAGICAL(a1.any_sv))) {
                 /* mg_set could die, skipping the freeing of a0 and
                  * a1; Ensure that they're always freed in that case */
@@ -947,73 +1155,69 @@ Perl_leave_scope(pTHX_ I32 base)
                 PL_localizing = 0;
                 break;
             }
-           SvREFCNT_dec_NN(a1.any_sv);
-           SvREFCNT_dec(a0.any_sv);
-           break;
+            SvREFCNT_dec_NN(a1.any_sv);
+            SvREFCNT_dec(a0.any_sv);
+            break;
         }
 
-       case SAVEt_GENERIC_PVREF:               /* generic pv */
+        case SAVEt_GENERIC_PVREF:              /* generic pv */
             a0 = ap[0]; a1 = ap[1];
-           if (*a1.any_pvp != a0.any_pv) {
-               Safefree(*a1.any_pvp);
-               *a1.any_pvp = a0.any_pv;
-           }
-           break;
+            if (*a1.any_pvp != a0.any_pv) {
+                Safefree(*a1.any_pvp);
+                *a1.any_pvp = a0.any_pv;
+            }
+            break;
 
-       case SAVEt_SHARED_PVREF:                /* shared pv */
+        case SAVEt_SHARED_PVREF:               /* shared pv */
             a0 = ap[0]; a1 = ap[1];
-           if (*a0.any_pvp != a1.any_pv) {
-#ifdef NETWARE
-               PerlMem_free(*a0.any_pvp);
-#else
-               PerlMemShared_free(*a0.any_pvp);
-#endif
-               *a0.any_pvp = a1.any_pv;
-           }
-           break;
+            if (*a0.any_pvp != a1.any_pv) {
+                PerlMemShared_free(*a0.any_pvp);
+                *a0.any_pvp = a1.any_pv;
+            }
+            break;
 
-       case SAVEt_GVSV:                        /* scalar slot in GV */
+        case SAVEt_GVSV:                       /* scalar slot in GV */
             a0 = ap[0]; a1 = ap[1];
-           a0.any_svp = &GvSV(a0.any_gv);
-           goto restore_svp;
+            a0.any_svp = &GvSV(a0.any_gv);
+            goto restore_svp;
 
-       case SAVEt_GENERIC_SVREF:               /* generic sv */
+        case SAVEt_GENERIC_SVREF:              /* generic sv */
             a0 = ap[0]; a1 = ap[1];
-       restore_svp:
+        restore_svp:
         {
             /* do *a0.any_svp = a1 */
-           SV * const sv = *a0.any_svp;
-           *a0.any_svp = a1.any_sv;
-           SvREFCNT_dec(sv);
-           SvREFCNT_dec(a1.any_sv);
-           break;
+            SV * const sv = *a0.any_svp;
+            *a0.any_svp = a1.any_sv;
+            SvREFCNT_dec(sv);
+            SvREFCNT_dec(a1.any_sv);
+            break;
         }
 
-       case SAVEt_GVSLOT:                      /* any slot in GV */
+        case SAVEt_GVSLOT:                     /* any slot in GV */
         {
             HV * hv;
             a0 = ap[0]; a1 = ap[1]; a2 = ap[2];
             hv = GvSTASH(a0.any_gv);
-           if (hv && HvENAME(hv) && (
-                   (a2.any_sv && SvTYPE(a2.any_sv) == SVt_PVCV)
-                || (*a1.any_svp && SvTYPE(*a1.any_svp) == SVt_PVCV)
-              ))
-           {
-               if ((char *)a1.any_svp < (char *)GvGP(a0.any_gv)
-                || (char *)a1.any_svp > (char *)GvGP(a0.any_gv) + sizeof(struct gp)
-                || GvREFCNT(a0.any_gv) > 2) /* "> 2" to ignore savestack's ref */
-                   PL_sub_generation++;
-               else mro_method_changed_in(hv);
-           }
+            if (hv && HvENAME(hv) && (
+                    (a2.any_sv && SvTYPE(a2.any_sv) == SVt_PVCV)
+                 || (*a1.any_svp && SvTYPE(*a1.any_svp) == SVt_PVCV)
+               ))
+            {
+                if ((char *)a1.any_svp < (char *)GvGP(a0.any_gv)
+                 || (char *)a1.any_svp > (char *)GvGP(a0.any_gv) + sizeof(struct gp)
+                 || GvREFCNT(a0.any_gv) > 2) /* "> 2" to ignore savestack's ref */
+                    PL_sub_generation++;
+                else mro_method_changed_in(hv);
+            }
             a0.any_svp = a1.any_svp;
             a1.any_sv  = a2.any_sv;
-           goto restore_svp;
+            goto restore_svp;
         }
 
-       case SAVEt_AV:                          /* array reference */
+        case SAVEt_AV:                         /* array reference */
             a0 = ap[0]; a1 = ap[1];
-           SvREFCNT_dec(GvAV(a0.any_gv));
-           GvAV(a0.any_gv) = a1.any_av;
+            SvREFCNT_dec(GvAV(a0.any_gv));
+            GvAV(a0.any_gv) = a1.any_av;
           avhv_common:
             if (UNLIKELY(SvSMAGICAL(a1.any_sv))) {
                 /* mg_set might die, so make sure a0 isn't leaked */
@@ -1026,136 +1230,141 @@ Perl_leave_scope(pTHX_ I32 base)
                 PL_localizing = 0;
                 break;
             }
-           SvREFCNT_dec_NN(a0.any_sv);
-           break;
+            SvREFCNT_dec_NN(a0.any_sv);
+            break;
 
-       case SAVEt_HV:                          /* hash reference */
+        case SAVEt_HV:                         /* hash reference */
             a0 = ap[0]; a1 = ap[1];
-           SvREFCNT_dec(GvHV(a0.any_gv));
-           GvHV(a0.any_gv) = a1.any_hv;
+            SvREFCNT_dec(GvHV(a0.any_gv));
+            GvHV(a0.any_gv) = a1.any_hv;
             goto avhv_common;
 
-       case SAVEt_INT_SMALL:
+        case SAVEt_INT_SMALL:
             a0 = ap[0];
-           *(int*)a0.any_ptr = (int)(uv >> SAVE_TIGHT_SHIFT);
-           break;
+            *(int*)a0.any_ptr = (int)(uv >> SAVE_TIGHT_SHIFT);
+            break;
 
-       case SAVEt_INT:                         /* int reference */
+        case SAVEt_INT:                                /* int reference */
             a0 = ap[0]; a1 = ap[1];
-           *(int*)a1.any_ptr = (int)a0.any_i32;
-           break;
+            *(int*)a1.any_ptr = (int)a0.any_i32;
+            break;
 
-       case SAVEt_STRLEN:                      /* STRLEN/size_t ref */
+        case SAVEt_STRLEN_SMALL:
+            a0 = ap[0];
+            *(STRLEN*)a0.any_ptr = (STRLEN)(uv >> SAVE_TIGHT_SHIFT);
+            break;
+
+        case SAVEt_STRLEN:                     /* STRLEN/size_t ref */
             a0 = ap[0]; a1 = ap[1];
-           *(STRLEN*)a1.any_ptr = (STRLEN)a0.any_iv;
-           break;
+            *(STRLEN*)a1.any_ptr = (STRLEN)a0.any_iv;
+            break;
 
-       case SAVEt_TMPSFLOOR:                   /* restore PL_tmps_floor */
+        case SAVEt_TMPSFLOOR:                  /* restore PL_tmps_floor */
             a0 = ap[0];
-           PL_tmps_floor = (SSize_t)a0.any_iv;
-           break;
+            PL_tmps_floor = (SSize_t)a0.any_iv;
+            break;
 
-       case SAVEt_BOOL:                        /* bool reference */
+        case SAVEt_BOOL:                       /* bool reference */
             a0 = ap[0];
-           *(bool*)a0.any_ptr = cBOOL(uv >> 8);
+            *(bool*)a0.any_ptr = cBOOL(uv >> 8);
 #ifdef NO_TAINT_SUPPORT
             PERL_UNUSED_VAR(was);
 #else
-           if (UNLIKELY(a0.any_ptr == &(PL_tainted))) {
-               /* If we don't update <was>, to reflect what was saved on the
-                * stack for PL_tainted, then we will overwrite this attempt to
-                * restore it when we exit this routine.  Note that this won't
-                * work if this value was saved in a wider-than necessary type,
-                * such as I32 */
-               was = *(bool*)a0.any_ptr;
-           }
+            if (UNLIKELY(a0.any_ptr == &(PL_tainted))) {
+                /* If we don't update <was>, to reflect what was saved on the
+                 * stack for PL_tainted, then we will overwrite this attempt to
+                 * restore it when we exit this routine.  Note that this won't
+                 * work if this value was saved in a wider-than necessary type,
+                 * such as I32 */
+                was = *(bool*)a0.any_ptr;
+            }
 #endif
-           break;
+            break;
 
-       case SAVEt_I32_SMALL:
+        case SAVEt_I32_SMALL:
             a0 = ap[0];
-           *(I32*)a0.any_ptr = (I32)(uv >> SAVE_TIGHT_SHIFT);
-           break;
+            *(I32*)a0.any_ptr = (I32)(uv >> SAVE_TIGHT_SHIFT);
+            break;
 
-       case SAVEt_I32:                         /* I32 reference */
+        case SAVEt_I32:                                /* I32 reference */
             a0 = ap[0]; a1 = ap[1];
 #ifdef PERL_DEBUG_READONLY_OPS
             if (*(I32*)a1.any_ptr != a0.any_i32)
 #endif
                 *(I32*)a1.any_ptr = a0.any_i32;
-           break;
+            break;
 
-       case SAVEt_SPTR:                        /* SV* reference */
-       case SAVEt_VPTR:                        /* random* reference */
-       case SAVEt_PPTR:                        /* char* reference */
-       case SAVEt_HPTR:                        /* HV* reference */
-       case SAVEt_APTR:                        /* AV* reference */
+        case SAVEt_SPTR:                       /* SV* reference */
+        case SAVEt_VPTR:                       /* random* reference */
+        case SAVEt_PPTR:                       /* char* reference */
+        case SAVEt_HPTR:                       /* HV* reference */
+        case SAVEt_APTR:                       /* AV* reference */
             a0 = ap[0]; a1 = ap[1];
-           *a1.any_svp= a0.any_sv;
-           break;
+            *a1.any_svp= a0.any_sv;
+            break;
 
-       case SAVEt_GP:                          /* scalar reference */
+        case SAVEt_GP:                         /* scalar reference */
         {
             HV *hv;
-           bool had_method;
+            bool had_method;
 
             a0 = ap[0]; a1 = ap[1];
             /* possibly taking a method out of circulation */  
-           had_method = !!GvCVu(a0.any_gv);
-           gp_free(a0.any_gv);
-           GvGP_set(a0.any_gv, (GP*)a1.any_ptr);
-           if ((hv=GvSTASH(a0.any_gv)) && HvENAME_get(hv)) {
-               if (memEQs(GvNAME(a0.any_gv), GvNAMELEN(a0.any_gv), "ISA"))
-                   mro_isa_changed_in(hv);
+            had_method = cBOOL(GvCVu(a0.any_gv));
+            gp_free(a0.any_gv);
+            GvGP_set(a0.any_gv, (GP*)a1.any_ptr);
+            if ((hv=GvSTASH(a0.any_gv)) && HvENAME_get(hv)) {
+                if (memEQs(GvNAME(a0.any_gv), GvNAMELEN(a0.any_gv), "ISA"))
+                    mro_isa_changed_in(hv);
                 else if (had_method || GvCVu(a0.any_gv))
                     /* putting a method back into circulation ("local")*/      
                     gv_method_changed(a0.any_gv);
-           }
-           SvREFCNT_dec_NN(a0.any_gv);
-           break;
+            }
+            SvREFCNT_dec_NN(a0.any_gv);
+            break;
         }
 
-       case SAVEt_FREESV:
+        case SAVEt_FREESV:
             a0 = ap[0];
-           SvREFCNT_dec(a0.any_sv);
-           break;
+            SvREFCNT_dec(a0.any_sv);
+            break;
 
-       case SAVEt_FREEPADNAME:
+        case SAVEt_FREEPADNAME:
             a0 = ap[0];
-           PadnameREFCNT_dec((PADNAME *)a0.any_ptr);
-           break;
+            PadnameREFCNT_dec((PADNAME *)a0.any_ptr);
+            break;
 
-       case SAVEt_FREECOPHH:
+        case SAVEt_FREECOPHH:
             a0 = ap[0];
-           cophh_free((COPHH *)a0.any_ptr);
-           break;
+            cophh_free((COPHH *)a0.any_ptr);
+            break;
 
-       case SAVEt_MORTALIZESV:
+        case SAVEt_MORTALIZESV:
             a0 = ap[0];
-           sv_2mortal(a0.any_sv);
-           break;
+            sv_2mortal(a0.any_sv);
+            break;
 
-       case SAVEt_FREEOP:
+        case SAVEt_FREEOP:
             a0 = ap[0];
-           ASSERT_CURPAD_LEGAL("SAVEt_FREEOP");
-           op_free(a0.any_op);
-           break;
+            ASSERT_CURPAD_LEGAL("SAVEt_FREEOP");
+            op_free(a0.any_op);
+            break;
 
-       case SAVEt_FREEPV:
+        case SAVEt_FREEPV:
             a0 = ap[0];
-           Safefree(a0.any_ptr);
-           break;
+            Safefree(a0.any_ptr);
+            break;
 
         case SAVEt_CLEARPADRANGE:
         {
             I32 i;
-           SV **svp;
+            SV **svp;
             i = (I32)((uv >> SAVE_TIGHT_SHIFT) & OPpPADRANGE_COUNTMASK);
             svp = &PL_curpad[uv >>
                     (OPpPADRANGE_COUNTSHIFT + SAVE_TIGHT_SHIFT)] + i - 1;
             goto clearsv;
-       case SAVEt_CLEARSV:
-           svp = &PL_curpad[uv >> SAVE_TIGHT_SHIFT];
+        case SAVEt_CLEARSV:
+            svp = &PL_curpad[uv >> SAVE_TIGHT_SHIFT];
             i = 1;
           clearsv:
             for (; i; i--, svp--) {
@@ -1187,12 +1396,10 @@ Perl_leave_scope(pTHX_ I32 base)
                         if (SvREADONLY(sv))
                             SvREADONLY_off(sv);
 
-                        if (SvOOK(sv)) { /* OOK or HvAUX */
-                            if (SvTYPE(sv) == SVt_PVHV)
-                                Perl_hv_kill_backrefs(aTHX_ MUTABLE_HV(sv));
-                            else
-                                sv_backoff(sv);
-                        }
+                        if (SvTYPE(sv) == SVt_PVHV && HvHasAUX(sv))
+                            Perl_hv_kill_backrefs(aTHX_ MUTABLE_HV(sv));
+                        else if(SvOOK(sv))
+                            sv_backoff(sv);
 
                         if (SvMAGICAL(sv)) {
                             /* note that backrefs (either in HvAUX or magic)
@@ -1254,7 +1461,7 @@ Perl_leave_scope(pTHX_ I32 base)
                         CvLEXICAL_on(*svp);
                         break;
                     }
-                    default:   *svp = newSV(0);                break;
+                    default:   *svp = newSV_type(SVt_NULL);            break;
                     }
                     SvREFCNT_dec_NN(sv); /* Cast current value to the winds. */
                     /* preserve pad nature, but also mark as not live
@@ -1262,10 +1469,10 @@ Perl_leave_scope(pTHX_ I32 base)
                     SvFLAGS(*svp) |= SVs_PADSTALE;
                 }
             }
-           break;
+            break;
         }
 
-       case SAVEt_DELETE:
+        case SAVEt_DELETE:
             a0 = ap[0]; a1 = ap[1]; a2 = ap[2];
             /* hv_delete could die, so free the key and SvREFCNT_dec the
              * hv by pushing new save actions
@@ -1275,10 +1482,10 @@ Perl_leave_scope(pTHX_ I32 base)
             /* ap[2] is the hv */
             ap[3].any_uv = SAVEt_FREESV; /* was SAVEt_DELETE */
             PL_savestack_ix += 4;
-           (void)hv_delete(a2.any_hv, a0.any_pv, a1.any_i32, G_DISCARD);
-           break;
+            (void)hv_delete(a2.any_hv, a0.any_pv, a1.any_i32, G_DISCARD);
+            break;
 
-       case SAVEt_ADELETE:
+        case SAVEt_ADELETE:
             a0 = ap[0]; a1 = ap[1];
             /* av_delete could die, so SvREFCNT_dec the av by pushing a
              * new save action
@@ -1286,196 +1493,197 @@ Perl_leave_scope(pTHX_ I32 base)
             ap[0].any_av = a1.any_av;
             ap[1].any_uv = SAVEt_FREESV;
             PL_savestack_ix += 2;
-           (void)av_delete(a1.any_av, a0.any_iv, G_DISCARD);
-           break;
+            (void)av_delete(a1.any_av, a0.any_iv, G_DISCARD);
+            break;
 
-       case SAVEt_DESTRUCTOR_X:
+        case SAVEt_DESTRUCTOR_X:
             a0 = ap[0]; a1 = ap[1];
-           (*a0.any_dxptr)(aTHX_ a1.any_ptr);
-           break;
+            (*a0.any_dxptr)(aTHX_ a1.any_ptr);
+            break;
 
-       case SAVEt_REGCONTEXT:
-           /* regexp must have croaked */
-       case SAVEt_ALLOC:
-           PL_savestack_ix -= uv >> SAVE_TIGHT_SHIFT;
-           break;
+        case SAVEt_REGCONTEXT:
+            /* regexp must have croaked */
+        case SAVEt_ALLOC:
+            PL_savestack_ix -= uv >> SAVE_TIGHT_SHIFT;
+            break;
 
-       case SAVEt_STACK_POS:           /* Position on Perl stack */
+        case SAVEt_STACK_POS:          /* Position on Perl stack */
             a0 = ap[0];
-           PL_stack_sp = PL_stack_base + a0.any_i32;
-           break;
+            PL_stack_sp = PL_stack_base + a0.any_i32;
+            break;
 
-       case SAVEt_AELEM:               /* array element */
+        case SAVEt_AELEM:              /* array element */
         {
             SV **svp;
             a0 = ap[0]; a1 = ap[1]; a2 = ap[2];
-           svp = av_fetch(a0.any_av, a1.any_iv, 1);
-           if (UNLIKELY(!AvREAL(a0.any_av) && AvREIFY(a0.any_av))) /* undo reify guard */
-               SvREFCNT_dec(a2.any_sv);
-           if (LIKELY(svp)) {
-               SV * const sv = *svp;
-               if (LIKELY(sv && sv != &PL_sv_undef)) {
-                   if (UNLIKELY(SvTIED_mg((const SV *)a0.any_av, PERL_MAGIC_tied)))
-                       SvREFCNT_inc_void_NN(sv);
+            svp = av_fetch(a0.any_av, a1.any_iv, 1);
+            if (UNLIKELY(!AvREAL(a0.any_av) && AvREIFY(a0.any_av))) /* undo reify guard */
+                SvREFCNT_dec(a2.any_sv);
+            if (LIKELY(svp)) {
+                SV * const sv = *svp;
+                if (LIKELY(sv && sv != &PL_sv_undef)) {
+                    if (UNLIKELY(SvTIED_mg((const SV *)a0.any_av, PERL_MAGIC_tied)))
+                        SvREFCNT_inc_void_NN(sv);
                     a1.any_sv  = a2.any_sv;
                     a2.any_svp = svp;
-                   goto restore_sv;
-               }
-           }
-           SvREFCNT_dec(a0.any_av);
-           SvREFCNT_dec(a2.any_sv);
-           break;
+                    goto restore_sv;
+                }
+            }
+            SvREFCNT_dec(a0.any_av);
+            SvREFCNT_dec(a2.any_sv);
+            break;
         }
 
-       case SAVEt_HELEM:               /* hash element */
+        case SAVEt_HELEM:              /* hash element */
         {
-           HE *he;
+            HE *he;
 
             a0 = ap[0]; a1 = ap[1]; a2 = ap[2];
-           he = hv_fetch_ent(a0.any_hv, a1.any_sv, 1, 0);
-           SvREFCNT_dec(a1.any_sv);
-           if (LIKELY(he)) {
-               const SV * const oval = HeVAL(he);
-               if (LIKELY(oval && oval != &PL_sv_undef)) {
+            he = hv_fetch_ent(a0.any_hv, a1.any_sv, 1, 0);
+            SvREFCNT_dec(a1.any_sv);
+            if (LIKELY(he)) {
+                const SV * const oval = HeVAL(he);
+                if (LIKELY(oval && oval != &PL_sv_undef)) {
                     SV **svp = &HeVAL(he);
-                   if (UNLIKELY(SvTIED_mg((const SV *)a0.any_hv, PERL_MAGIC_tied)))
-                       SvREFCNT_inc_void(*svp);
+                    if (UNLIKELY(SvTIED_mg((const SV *)a0.any_hv, PERL_MAGIC_tied)))
+                        SvREFCNT_inc_void(*svp);
                     a1.any_sv  = a2.any_sv;
                     a2.any_svp = svp;
-                   goto restore_sv;
-               }
-           }
-           SvREFCNT_dec(a0.any_hv);
-           SvREFCNT_dec(a2.any_sv);
-           break;
+                    goto restore_sv;
+                }
+            }
+            SvREFCNT_dec(a0.any_hv);
+            SvREFCNT_dec(a2.any_sv);
+            break;
         }
 
-       case SAVEt_OP:
+        case SAVEt_OP:
             a0 = ap[0];
-           PL_op = (OP*)a0.any_ptr;
-           break;
+            PL_op = (OP*)a0.any_ptr;
+            break;
 
         case SAVEt_HINTS_HH:
             a2 = ap[2];
             /* FALLTHROUGH */
         case SAVEt_HINTS:
             a0 = ap[0]; a1 = ap[1];
-           if ((PL_hints & HINT_LOCALIZE_HH)) {
-             while (GvHV(PL_hintgv)) {
-               HV *hv = GvHV(PL_hintgv);
-               GvHV(PL_hintgv) = NULL;
-               SvREFCNT_dec(MUTABLE_SV(hv));
-             }
-           }
-           cophh_free(CopHINTHASH_get(&PL_compiling));
-           CopHINTHASH_set(&PL_compiling, (COPHH*)a1.any_ptr);
-           *(I32*)&PL_hints = a0.any_i32;
-           if (type == SAVEt_HINTS_HH) {
-               SvREFCNT_dec(MUTABLE_SV(GvHV(PL_hintgv)));
+            if ((PL_hints & HINT_LOCALIZE_HH)) {
+              while (GvHV(PL_hintgv)) {
+                HV *hv = GvHV(PL_hintgv);
+                GvHV(PL_hintgv) = NULL;
+                SvREFCNT_dec(MUTABLE_SV(hv));
+              }
+            }
+            cophh_free(CopHINTHASH_get(&PL_compiling));
+            CopHINTHASH_set(&PL_compiling, (COPHH*)a1.any_ptr);
+            *(I32*)&PL_hints = a0.any_i32;
+            PL_prevailing_version = (U16)(uv >> 8);
+            if (type == SAVEt_HINTS_HH) {
+                SvREFCNT_dec(MUTABLE_SV(GvHV(PL_hintgv)));
                 GvHV(PL_hintgv) = MUTABLE_HV(a2.any_ptr);
-           }
-           if (!GvHV(PL_hintgv)) {
-               /* Need to add a new one manually, else rv2hv can
-                  add one via GvHVn and it won't have the magic set.  */
-               HV *const hv = newHV();
-               hv_magic(hv, NULL, PERL_MAGIC_hints);
-               GvHV(PL_hintgv) = hv;
-           }
-           assert(GvHV(PL_hintgv));
-           break;
-
-       case SAVEt_COMPPAD:
+            }
+            if (!GvHV(PL_hintgv)) {
+                /* Need to add a new one manually, else rv2hv can
+                   add one via GvHVn and it won't have the magic set.  */
+                HV *const hv = newHV();
+                hv_magic(hv, NULL, PERL_MAGIC_hints);
+                GvHV(PL_hintgv) = hv;
+            }
+            assert(GvHV(PL_hintgv));
+            break;
+
+        case SAVEt_COMPPAD:
             a0 = ap[0];
-           PL_comppad = (PAD*)a0.any_ptr;
-           if (LIKELY(PL_comppad))
-               PL_curpad = AvARRAY(PL_comppad);
-           else
-               PL_curpad = NULL;
-           break;
+            PL_comppad = (PAD*)a0.any_ptr;
+            if (LIKELY(PL_comppad))
+                PL_curpad = AvARRAY(PL_comppad);
+            else
+                PL_curpad = NULL;
+            break;
 
-       case SAVEt_PADSV_AND_MORTALIZE:
-           {
-               SV **svp;
+        case SAVEt_PADSV_AND_MORTALIZE:
+            {
+                SV **svp;
 
                 a0 = ap[0]; a1 = ap[1]; a2 = ap[2];
-               assert (a1.any_ptr);
-               svp = AvARRAY((PAD*)a1.any_ptr) + (PADOFFSET)a2.any_uv;
+                assert (a1.any_ptr);
+                svp = AvARRAY((PAD*)a1.any_ptr) + (PADOFFSET)a2.any_uv;
                 /* This mortalizing used to be done by CX_POOPLOOP() via
                    itersave.  But as we have all the information here, we
                    can do it here, save even having to have itersave in
                    the struct.
                    */
-               sv_2mortal(*svp);
-               *svp = a0.any_sv;
-           }
-           break;
+                sv_2mortal(*svp);
+                *svp = a0.any_sv;
+            }
+            break;
 
-       case SAVEt_SAVESWITCHSTACK:
-           {
-               dSP;
+        case SAVEt_SAVESWITCHSTACK:
+            {
+                dSP;
 
                 a0 = ap[0]; a1 = ap[1];
-               SWITCHSTACK(a1.any_av, a0.any_av);
-               PL_curstackinfo->si_stack = a0.any_av;
-           }
-           break;
+                SWITCHSTACK(a1.any_av, a0.any_av);
+                PL_curstackinfo->si_stack = a0.any_av;
+            }
+            break;
 
-       case SAVEt_SET_SVFLAGS:
+        case SAVEt_SET_SVFLAGS:
             a0 = ap[0]; a1 = ap[1]; a2 = ap[2];
             SvFLAGS(a0.any_sv) &= ~(a1.any_u32);
             SvFLAGS(a0.any_sv) |= a2.any_u32;
-           break;
+            break;
 
-           /* These are only saved in mathoms.c */
-       case SAVEt_NSTAB:
+            /* These are only saved in mathoms.c */
+        case SAVEt_NSTAB:
             a0 = ap[0];
-           (void)sv_clear(a0.any_sv);
-           break;
+            (void)sv_clear(a0.any_sv);
+            break;
 
-       case SAVEt_LONG:                        /* long reference */
+        case SAVEt_LONG:                       /* long reference */
             a0 = ap[0]; a1 = ap[1];
-           *(long*)a1.any_ptr = a0.any_long;
-           break;
+            *(long*)a1.any_ptr = a0.any_long;
+            break;
 
-       case SAVEt_IV:                          /* IV reference */
+        case SAVEt_IV:                         /* IV reference */
             a0 = ap[0]; a1 = ap[1];
-           *(IV*)a1.any_ptr = a0.any_iv;
-           break;
+            *(IV*)a1.any_ptr = a0.any_iv;
+            break;
 
-       case SAVEt_I16:                         /* I16 reference */
+        case SAVEt_I16:                                /* I16 reference */
             a0 = ap[0];
-           *(I16*)a0.any_ptr = (I16)(uv >> 8);
-           break;
+            *(I16*)a0.any_ptr = (I16)(uv >> 8);
+            break;
 
-       case SAVEt_I8:                          /* I8 reference */
+        case SAVEt_I8:                         /* I8 reference */
             a0 = ap[0];
-           *(I8*)a0.any_ptr = (I8)(uv >> 8);
-           break;
+            *(I8*)a0.any_ptr = (I8)(uv >> 8);
+            break;
 
-       case SAVEt_DESTRUCTOR:
+        case SAVEt_DESTRUCTOR:
             a0 = ap[0]; a1 = ap[1];
-           (*a0.any_dptr)(a1.any_ptr);
-           break;
+            (*a0.any_dptr)(a1.any_ptr);
+            break;
 
-       case SAVEt_COMPILE_WARNINGS:
+        case SAVEt_COMPILE_WARNINGS:
             a0 = ap[0];
         free_and_set_cop_warnings(&PL_compiling, (STRLEN*) a0.any_ptr);
-           break;
+            break;
 
-       case SAVEt_PARSER:
+        case SAVEt_PARSER:
             a0 = ap[0];
-           parser_free((yy_parser *)a0.any_ptr);
-           break;
+            parser_free((yy_parser *)a0.any_ptr);
+            break;
 
-       case SAVEt_READONLY_OFF:
+        case SAVEt_READONLY_OFF:
             a0 = ap[0];
-           SvREADONLY_off(a0.any_sv);
-           break;
+            SvREADONLY_off(a0.any_sv);
+            break;
 
-       default:
-           Perl_croak(aTHX_ "panic: leave_scope inconsistency %u",
+        default:
+            Perl_croak(aTHX_ "panic: leave_scope inconsistency %u",
                     (U8)uv & SAVE_MASK);
-       }
+        }
     }
 
     TAINT_set(was);
@@ -1489,119 +1697,120 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx)
 #ifdef DEBUGGING
     PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), PL_block_type[CxTYPE(cx)]);
     if (CxTYPE(cx) != CXt_SUBST) {
-       const char *gimme_text;
-       PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp);
-       PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%" UVxf "\n",
-                     PTR2UV(cx->blk_oldcop));
-       PerlIO_printf(Perl_debug_log, "BLK_OLDMARKSP = %ld\n", (long)cx->blk_oldmarksp);
-       PerlIO_printf(Perl_debug_log, "BLK_OLDSCOPESP = %ld\n", (long)cx->blk_oldscopesp);
-       PerlIO_printf(Perl_debug_log, "BLK_OLDSAVEIX = %ld\n", (long)cx->blk_oldsaveix);
-       PerlIO_printf(Perl_debug_log, "BLK_OLDPM = 0x%" UVxf "\n",
-                     PTR2UV(cx->blk_oldpm));
-       switch (cx->blk_gimme) {
-           case G_VOID:
-               gimme_text = "VOID";
-               break;
-           case G_SCALAR:
-               gimme_text = "SCALAR";
-               break;
-           case G_ARRAY:
-               gimme_text = "LIST";
-               break;
-           default:
-               gimme_text = "UNKNOWN";
-               break;
-       }
-       PerlIO_printf(Perl_debug_log, "BLK_GIMME = %s\n", gimme_text);
+        const char *gimme_text;
+        PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp);
+        PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%" UVxf "\n",
+                      PTR2UV(cx->blk_oldcop));
+        PerlIO_printf(Perl_debug_log, "BLK_OLDMARKSP = %ld\n", (long)cx->blk_oldmarksp);
+        PerlIO_printf(Perl_debug_log, "BLK_OLDSCOPESP = %ld\n", (long)cx->blk_oldscopesp);
+        PerlIO_printf(Perl_debug_log, "BLK_OLDSAVEIX = %ld\n", (long)cx->blk_oldsaveix);
+        PerlIO_printf(Perl_debug_log, "BLK_OLDPM = 0x%" UVxf "\n",
+                      PTR2UV(cx->blk_oldpm));
+        switch (cx->blk_gimme) {
+            case G_VOID:
+                gimme_text = "VOID";
+                break;
+            case G_SCALAR:
+                gimme_text = "SCALAR";
+                break;
+            case G_LIST:
+                gimme_text = "LIST";
+                break;
+            default:
+                gimme_text = "UNKNOWN";
+                break;
+        }
+        PerlIO_printf(Perl_debug_log, "BLK_GIMME = %s\n", gimme_text);
     }
     switch (CxTYPE(cx)) {
     case CXt_NULL:
     case CXt_BLOCK:
-       break;
+    case CXt_DEFER:
+        break;
     case CXt_FORMAT:
-       PerlIO_printf(Perl_debug_log, "BLK_FORMAT.CV = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_format.cv));
-       PerlIO_printf(Perl_debug_log, "BLK_FORMAT.GV = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_format.gv));
-       PerlIO_printf(Perl_debug_log, "BLK_FORMAT.DFOUTGV = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_format.dfoutgv));
-       PerlIO_printf(Perl_debug_log, "BLK_FORMAT.HASARGS = %d\n",
-                     (int)CxHASARGS(cx));
-       PerlIO_printf(Perl_debug_log, "BLK_FORMAT.RETOP = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_format.retop));
-       break;
+        PerlIO_printf(Perl_debug_log, "BLK_FORMAT.CV = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_format.cv));
+        PerlIO_printf(Perl_debug_log, "BLK_FORMAT.GV = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_format.gv));
+        PerlIO_printf(Perl_debug_log, "BLK_FORMAT.DFOUTGV = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_format.dfoutgv));
+        PerlIO_printf(Perl_debug_log, "BLK_FORMAT.HASARGS = %d\n",
+                      (int)CxHASARGS(cx));
+        PerlIO_printf(Perl_debug_log, "BLK_FORMAT.RETOP = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_format.retop));
+        break;
     case CXt_SUB:
-       PerlIO_printf(Perl_debug_log, "BLK_SUB.CV = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_sub.cv));
-       PerlIO_printf(Perl_debug_log, "BLK_SUB.OLDDEPTH = %ld\n",
-               (long)cx->blk_sub.olddepth);
-       PerlIO_printf(Perl_debug_log, "BLK_SUB.HASARGS = %d\n",
-               (int)CxHASARGS(cx));
-       PerlIO_printf(Perl_debug_log, "BLK_SUB.LVAL = %d\n", (int)CxLVAL(cx));
-       PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_sub.retop));
-       break;
+        PerlIO_printf(Perl_debug_log, "BLK_SUB.CV = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_sub.cv));
+        PerlIO_printf(Perl_debug_log, "BLK_SUB.OLDDEPTH = %ld\n",
+                (long)cx->blk_sub.olddepth);
+        PerlIO_printf(Perl_debug_log, "BLK_SUB.HASARGS = %d\n",
+                (int)CxHASARGS(cx));
+        PerlIO_printf(Perl_debug_log, "BLK_SUB.LVAL = %d\n", (int)CxLVAL(cx));
+        PerlIO_printf(Perl_debug_log, "BLK_SUB.RETOP = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_sub.retop));
+        break;
     case CXt_EVAL:
-       PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_IN_EVAL = %ld\n",
-               (long)CxOLD_IN_EVAL(cx));
-       PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_OP_TYPE = %s (%s)\n",
-               PL_op_name[CxOLD_OP_TYPE(cx)],
-               PL_op_desc[CxOLD_OP_TYPE(cx)]);
-       if (cx->blk_eval.old_namesv)
-           PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n",
-                         SvPVX_const(cx->blk_eval.old_namesv));
-       PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_EVAL_ROOT = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_eval.old_eval_root));
-       PerlIO_printf(Perl_debug_log, "BLK_EVAL.RETOP = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_eval.retop));
-       break;
+        PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_IN_EVAL = %ld\n",
+                (long)CxOLD_IN_EVAL(cx));
+        PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_OP_TYPE = %s (%s)\n",
+                PL_op_name[CxOLD_OP_TYPE(cx)],
+                PL_op_desc[CxOLD_OP_TYPE(cx)]);
+        if (cx->blk_eval.old_namesv)
+            PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n",
+                          SvPVX_const(cx->blk_eval.old_namesv));
+        PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_EVAL_ROOT = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_eval.old_eval_root));
+        PerlIO_printf(Perl_debug_log, "BLK_EVAL.RETOP = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_eval.retop));
+        break;
 
     case CXt_LOOP_PLAIN:
     case CXt_LOOP_LAZYIV:
     case CXt_LOOP_LAZYSV:
     case CXt_LOOP_LIST:
     case CXt_LOOP_ARY:
-       PerlIO_printf(Perl_debug_log, "BLK_LOOP.LABEL = %s\n", CxLABEL(cx));
-       PerlIO_printf(Perl_debug_log, "BLK_LOOP.MY_OP = 0x%" UVxf "\n",
-               PTR2UV(cx->blk_loop.my_op));
+        PerlIO_printf(Perl_debug_log, "BLK_LOOP.LABEL = %s\n", CxLABEL(cx));
+        PerlIO_printf(Perl_debug_log, "BLK_LOOP.MY_OP = 0x%" UVxf "\n",
+                PTR2UV(cx->blk_loop.my_op));
         if (CxTYPE(cx) != CXt_LOOP_PLAIN) {
             PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERVAR = 0x%" UVxf "\n",
                     PTR2UV(CxITERVAR(cx)));
             PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERSAVE = 0x%" UVxf "\n",
                     PTR2UV(cx->blk_loop.itersave));
-       }
-       if (CxTYPE(cx) == CXt_LOOP_ARY) {
+        }
+        if (CxTYPE(cx) == CXt_LOOP_ARY) {
             PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%" UVxf "\n",
                     PTR2UV(cx->blk_loop.state_u.ary.ary));
             PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n",
                     (long)cx->blk_loop.state_u.ary.ix);
         }
-       break;
+        break;
 
     case CXt_SUBST:
-       PerlIO_printf(Perl_debug_log, "SB_ITERS = %ld\n",
-               (long)cx->sb_iters);
-       PerlIO_printf(Perl_debug_log, "SB_MAXITERS = %ld\n",
-               (long)cx->sb_maxiters);
-       PerlIO_printf(Perl_debug_log, "SB_RFLAGS = %ld\n",
-               (long)cx->sb_rflags);
-       PerlIO_printf(Perl_debug_log, "SB_ONCE = %ld\n",
-               (long)CxONCE(cx));
-       PerlIO_printf(Perl_debug_log, "SB_ORIG = %s\n",
-               cx->sb_orig);
-       PerlIO_printf(Perl_debug_log, "SB_DSTR = 0x%" UVxf "\n",
-               PTR2UV(cx->sb_dstr));
-       PerlIO_printf(Perl_debug_log, "SB_TARG = 0x%" UVxf "\n",
-               PTR2UV(cx->sb_targ));
-       PerlIO_printf(Perl_debug_log, "SB_S = 0x%" UVxf "\n",
-               PTR2UV(cx->sb_s));
-       PerlIO_printf(Perl_debug_log, "SB_M = 0x%" UVxf "\n",
-               PTR2UV(cx->sb_m));
-       PerlIO_printf(Perl_debug_log, "SB_STREND = 0x%" UVxf "\n",
-               PTR2UV(cx->sb_strend));
-       PerlIO_printf(Perl_debug_log, "SB_RXRES = 0x%" UVxf "\n",
-               PTR2UV(cx->sb_rxres));
-       break;
+        PerlIO_printf(Perl_debug_log, "SB_ITERS = %ld\n",
+                (long)cx->sb_iters);
+        PerlIO_printf(Perl_debug_log, "SB_MAXITERS = %ld\n",
+                (long)cx->sb_maxiters);
+        PerlIO_printf(Perl_debug_log, "SB_RFLAGS = %ld\n",
+                (long)cx->sb_rflags);
+        PerlIO_printf(Perl_debug_log, "SB_ONCE = %ld\n",
+                (long)CxONCE(cx));
+        PerlIO_printf(Perl_debug_log, "SB_ORIG = %s\n",
+                cx->sb_orig);
+        PerlIO_printf(Perl_debug_log, "SB_DSTR = 0x%" UVxf "\n",
+                PTR2UV(cx->sb_dstr));
+        PerlIO_printf(Perl_debug_log, "SB_TARG = 0x%" UVxf "\n",
+                PTR2UV(cx->sb_targ));
+        PerlIO_printf(Perl_debug_log, "SB_S = 0x%" UVxf "\n",
+                PTR2UV(cx->sb_s));
+        PerlIO_printf(Perl_debug_log, "SB_M = 0x%" UVxf "\n",
+                PTR2UV(cx->sb_m));
+        PerlIO_printf(Perl_debug_log, "SB_STREND = 0x%" UVxf "\n",
+                PTR2UV(cx->sb_strend));
+        PerlIO_printf(Perl_debug_log, "SB_RXRES = 0x%" UVxf "\n",
+                PTR2UV(cx->sb_rxres));
+        break;
     }
 #else
     PERL_UNUSED_CONTEXT;