X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/7a4c00b4303a05a04564a03a88f4fa5c7a06a6e9..a99072da2bc541e260dfb72e5ba6c9d6c6136d42:/scope.c

diff --git a/scope.c b/scope.c
index 2fdea90..7a0a578 100644
--- a/scope.c
+++ b/scope.c
@@ -1,6 +1,6 @@
 /*    scope.c
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -16,38 +16,76 @@
 #include "perl.h"
 
 SV**
-stack_grow(sp, p, n)
-SV** sp;
-SV** p;
-int n;
+stack_grow(SV **sp, SV **p, int n)
 {
+    dTHR;
+#if defined(DEBUGGING) && !defined(USE_THREADS)
+    static int growing = 0;
+    if (growing++)
+      abort();
+#endif
     stack_sp = sp;
+#ifndef STRESS_REALLOC
     av_extend(curstack, (p - stack_base) + (n) + 128);
+#else
+    av_extend(curstack, (p - stack_base) + (n) + 1);
+#endif
+#if defined(DEBUGGING) && !defined(USE_THREADS)
+    growing--;
+#endif
     return stack_sp;
 }
 
+#ifndef STRESS_REALLOC
+#define GROW(old) ((old) * 3 / 2)
+#else
+#define GROW(old) ((old) + 1)
+#endif
+
+PERL_SI *
+new_stackinfo(I32 stitems, I32 cxitems)
+{
+    PERL_SI *si;
+    PERL_CONTEXT *cxt;
+    New(56, si, 1, PERL_SI);
+    si->si_stack = newAV();
+    AvREAL_off(si->si_stack);
+    av_extend(si->si_stack, stitems > 0 ? stitems-1 : 0);
+    AvALLOC(si->si_stack)[0] = &sv_undef;
+    AvFILLp(si->si_stack) = 0;
+    si->si_prev = 0;
+    si->si_next = 0;
+    si->si_cxmax = cxitems - 1;
+    si->si_cxix = -1;
+    si->si_type = SI_UNDEF;
+    New(56, si->si_cxstack, cxitems, PERL_CONTEXT);
+    return si;
+}
+
 I32
-cxinc()
+cxinc(void)
 {
-    cxstack_max = cxstack_max * 3 / 2;
-    Renew(cxstack, cxstack_max + 1, CONTEXT);	/* XXX should fix CXINC macro */
+    dTHR;
+    cxstack_max = GROW(cxstack_max);
+    Renew(cxstack, cxstack_max + 1, PERL_CONTEXT);	/* XXX should fix CXINC macro */
     return cxstack_ix + 1;
 }
 
 void
-push_return(retop)
-OP *retop;
+push_return(OP *retop)
 {
+    dTHR;
     if (retstack_ix == retstack_max) {
-	retstack_max = retstack_max * 3 / 2;
+	retstack_max = GROW(retstack_max);
 	Renew(retstack, retstack_max, OP*);
     }
     retstack[retstack_ix++] = retop;
 }
 
 OP *
-pop_return()
+pop_return(void)
 {
+    dTHR;
     if (retstack_ix > 0)
 	return retstack[--retstack_ix];
     else
@@ -55,10 +93,11 @@ pop_return()
 }
 
 void
-push_scope()
+push_scope(void)
 {
+    dTHR;
     if (scopestack_ix == scopestack_max) {
-	scopestack_max = scopestack_max * 3 / 2;
+	scopestack_max = GROW(scopestack_max);
 	Renew(scopestack, scopestack_max, I32);
     }
     scopestack[scopestack_ix++] = savestack_ix;
@@ -66,17 +105,19 @@ push_scope()
 }
 
 void
-pop_scope()
+pop_scope(void)
 {
+    dTHR;
     I32 oldsave = scopestack[--scopestack_ix];
     LEAVE_SCOPE(oldsave);
 }
 
 void
-markstack_grow()
+markstack_grow(void)
 {
+    dTHR;
     I32 oldmax = markstack_max - markstack;
-    I32 newmax = oldmax * 3 / 2;
+    I32 newmax = GROW(oldmax);
 
     Renew(markstack, newmax, I32);
     markstack_ptr = markstack + oldmax;
@@ -84,15 +125,19 @@ markstack_grow()
 }
 
 void
-savestack_grow()
+savestack_grow(void)
 {
-    savestack_max = savestack_max * 3 / 2;
+    dTHR;
+    savestack_max = GROW(savestack_max) + 4; 
     Renew(savestack, savestack_max, ANY);
 }
 
+#undef GROW
+
 void
-free_tmps()
+free_tmps(void)
 {
+    dTHR;
     /* XXX should tmps_floor live in cxstack? */
     I32 myfloor = tmps_floor;
     while (tmps_ix > myfloor) {      /* clean up after last statement */
@@ -107,10 +152,10 @@ free_tmps()
     }
 }
 
-static SV *
-save_scalar_at(sptr)
-SV **sptr;
+STATIC SV *
+save_scalar_at(SV **sptr)
 {
+    dTHR;
     register SV *sv;
     SV *osv = *sptr;
 
@@ -139,33 +184,38 @@ SV **sptr;
 }
 
 SV *
-save_scalar(gv)
-GV *gv;
+save_scalar(GV *gv)
 {
+    dTHR;
+    SV **sptr = &GvSV(gv);
     SSCHECK(3);
-    SSPUSHPTR(gv);
-    SSPUSHPTR(GvSV(gv));
+    SSPUSHPTR(SvREFCNT_inc(gv));
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
     SSPUSHINT(SAVEt_SV);
-    return save_scalar_at(&GvSV(gv));
+    return save_scalar_at(sptr);
 }
 
 SV*
-save_svref(sptr)
-SV **sptr;
+save_svref(SV **sptr)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(sptr);
-    SSPUSHPTR(*sptr);
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
     SSPUSHINT(SAVEt_SVREF);
     return save_scalar_at(sptr);
 }
 
 void
-save_gp(gv, empty)
-GV *gv;
-I32 empty;
-{
-    SSCHECK(3);
+save_gp(GV *gv, I32 empty)
+{
+    dTHR;
+    SSCHECK(6);
+    SSPUSHIV((IV)SvLEN(gv));
+    SvLEN(gv) = 0; /* forget that anything was allocated here */
+    SSPUSHIV((IV)SvCUR(gv));
+    SSPUSHPTR(SvPVX(gv));
+    SvPOK_off(gv);
     SSPUSHPTR(SvREFCNT_inc(gv));
     SSPUSHPTR(GvGP(gv));
     SSPUSHINT(SAVEt_GP);
@@ -173,62 +223,87 @@ I32 empty;
     if (empty) {
 	register GP *gp;
 	Newz(602, gp, 1, GP);
-	GvGP(gv) = gp;
-	GvREFCNT(gv) = 1;
+	GvGP(gv) = gp_ref(gp);
 	GvSV(gv) = NEWSV(72,0);
 	GvLINE(gv) = curcop->cop_line;
 	GvEGV(gv) = gv;
     }
     else {
-	GvGP(gv)->gp_refcnt++;
+	gp_ref(GvGP(gv));
 	GvINTRO_on(gv);
     }
 }
 
 AV *
-save_ary(gv)
-GV *gv;
+save_ary(GV *gv)
 {
+    dTHR;
+    AV *oav = GvAVn(gv);
+    AV *av;
+
+    if (!AvREAL(oav) && AvREIFY(oav))
+	av_reify(oav);
     SSCHECK(3);
     SSPUSHPTR(gv);
-    SSPUSHPTR(GvAVn(gv));
+    SSPUSHPTR(oav);
     SSPUSHINT(SAVEt_AV);
 
     GvAV(gv) = Null(AV*);
-    return GvAVn(gv);
+    av = GvAVn(gv);
+    if (SvMAGIC(oav)) {
+	SvMAGIC(av) = SvMAGIC(oav);
+	SvFLAGS(av) |= SvMAGICAL(oav);
+	SvMAGICAL_off(oav);
+	SvMAGIC(oav) = 0;
+	localizing = 1;
+	SvSETMAGIC((SV*)av);
+	localizing = 0;
+    }
+    return av;
 }
 
 HV *
-save_hash(gv)
-GV *gv;
+save_hash(GV *gv)
 {
+    dTHR;
+    HV *ohv, *hv;
+
     SSCHECK(3);
     SSPUSHPTR(gv);
-    SSPUSHPTR(GvHVn(gv));
+    SSPUSHPTR(ohv = GvHVn(gv));
     SSPUSHINT(SAVEt_HV);
 
     GvHV(gv) = Null(HV*);
-    return GvHVn(gv);
+    hv = GvHVn(gv);
+    if (SvMAGIC(ohv)) {
+	SvMAGIC(hv) = SvMAGIC(ohv);
+	SvFLAGS(hv) |= SvMAGICAL(ohv);
+	SvMAGICAL_off(ohv);
+	SvMAGIC(ohv) = 0;
+	localizing = 1;
+	SvSETMAGIC((SV*)hv);
+	localizing = 0;
+    }
+    return hv;
 }
 
 void
-save_item(item)
-register SV *item;
+save_item(register SV *item)
 {
-    register SV *sv;
+    dTHR;
+    register SV *sv = NEWSV(0,0);
 
+    sv_setsv(sv,item);
     SSCHECK(3);
     SSPUSHPTR(item);		/* remember the pointer */
-    sv = NEWSV(0,0);
-    sv_setsv(sv,item);
     SSPUSHPTR(sv);		/* remember the value */
     SSPUSHINT(SAVEt_ITEM);
 }
 
 void
-save_int(intp)
-int *intp;
+save_int(int *intp)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHINT(*intp);
     SSPUSHPTR(intp);
@@ -236,9 +311,9 @@ int *intp;
 }
 
 void
-save_long(longp)
-long *longp;
+save_long(long int *longp)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHLONG(*longp);
     SSPUSHPTR(longp);
@@ -246,9 +321,9 @@ long *longp;
 }
 
 void
-save_I32(intp)
-I32 *intp;
+save_I32(I32 *intp)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHINT(*intp);
     SSPUSHPTR(intp);
@@ -256,9 +331,9 @@ I32 *intp;
 }
 
 void
-save_I16(intp)
-I16 *intp;
+save_I16(I16 *intp)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHINT(*intp);
     SSPUSHPTR(intp);
@@ -266,9 +341,9 @@ I16 *intp;
 }
 
 void
-save_iv(ivp)
-IV *ivp;
+save_iv(IV *ivp)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHIV(*ivp);
     SSPUSHPTR(ivp);
@@ -279,9 +354,9 @@ IV *ivp;
  * force word-alignment and we'll miss the pointer.
  */
 void
-save_pptr(pptr)
-char **pptr;
+save_pptr(char **pptr)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*pptr);
     SSPUSHPTR(pptr);
@@ -289,28 +364,44 @@ char **pptr;
 }
 
 void
-save_sptr(sptr)
-SV **sptr;
+save_sptr(SV **sptr)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*sptr);
     SSPUSHPTR(sptr);
     SSPUSHINT(SAVEt_SPTR);
 }
 
+SV **
+save_threadsv(PADOFFSET i)
+{
+#ifdef USE_THREADS
+    dTHR;
+    SV **svp = &THREADSV(i);	/* XXX Change to save by offset */
+    DEBUG_L(PerlIO_printf(PerlIO_stderr(), "save_threadsv %u: %p %p:%s\n",
+			  i, svp, *svp, SvPEEK(*svp)));
+    save_svref(svp);
+    return svp;
+#else
+    croak("panic: save_threadsv called in non-threaded perl");
+    return 0;
+#endif /* USE_THREADS */
+}
+
 void
-save_nogv(gv)
-GV *gv;
+save_nogv(GV *gv)
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHPTR(gv);
     SSPUSHINT(SAVEt_NSTAB);
 }
 
 void
-save_hptr(hptr)
-HV **hptr;
+save_hptr(HV **hptr)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*hptr);
     SSPUSHPTR(hptr);
@@ -318,9 +409,9 @@ HV **hptr;
 }
 
 void
-save_aptr(aptr)
-AV **aptr;
+save_aptr(AV **aptr)
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*aptr);
     SSPUSHPTR(aptr);
@@ -328,77 +419,77 @@ AV **aptr;
 }
 
 void
-save_freesv(sv)
-SV *sv;
+save_freesv(SV *sv)
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHPTR(sv);
     SSPUSHINT(SAVEt_FREESV);
 }
 
 void
-save_freeop(op)
-OP *op;
+save_freeop(OP *o)
 {
+    dTHR;
     SSCHECK(2);
-    SSPUSHPTR(op);
+    SSPUSHPTR(o);
     SSPUSHINT(SAVEt_FREEOP);
 }
 
 void
-save_freepv(pv)
-char *pv;
+save_freepv(char *pv)
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHPTR(pv);
     SSPUSHINT(SAVEt_FREEPV);
 }
 
 void
-save_clearsv(svp)
-SV** svp;
+save_clearsv(SV **svp)
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHLONG((long)(svp-curpad));
     SSPUSHINT(SAVEt_CLEARSV);
 }
 
 void
-save_delete(hv,key,klen)
-HV *hv;
-char *key;
-I32 klen;
+save_delete(HV *hv, char *key, I32 klen)
 {
+    dTHR;
     SSCHECK(4);
     SSPUSHINT(klen);
     SSPUSHPTR(key);
-    SSPUSHPTR(hv);
+    SSPUSHPTR(SvREFCNT_inc(hv));
     SSPUSHINT(SAVEt_DELETE);
 }
 
 void
-save_list(sarg,maxsarg)
-register SV **sarg;
-I32 maxsarg;
+save_list(register SV **sarg, I32 maxsarg)
 {
+    dTHR;
     register SV *sv;
     register I32 i;
 
-    SSCHECK(3 * maxsarg);
     for (i = 1; i <= maxsarg; i++) {
-	SSPUSHPTR(sarg[i]);		/* remember the pointer */
 	sv = NEWSV(0,0);
 	sv_setsv(sv,sarg[i]);
+	SSCHECK(3);
+	SSPUSHPTR(sarg[i]);		/* remember the pointer */
 	SSPUSHPTR(sv);			/* remember the value */
 	SSPUSHINT(SAVEt_ITEM);
     }
 }
 
 void
-save_destructor(f,p)
-void (*f) _((void*));
-void* p;
+#ifdef PERL_OBJECT
+save_destructor(DESTRUCTORFUNC f, void* p)
+#else
+save_destructor(void (*f) (void *), void *p)
+#endif
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHDPTR(f);
     SSPUSHPTR(p);
@@ -406,15 +497,49 @@ void* p;
 }
 
 void
-leave_scope(base)
-I32 base;
+save_aelem(AV *av, I32 idx, SV **sptr)
+{
+    dTHR;
+    SSCHECK(4);
+    SSPUSHPTR(SvREFCNT_inc(av));
+    SSPUSHINT(idx);
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
+    SSPUSHINT(SAVEt_AELEM);
+    save_scalar_at(sptr);
+}
+
+void
+save_helem(HV *hv, SV *key, SV **sptr)
 {
+    dTHR;
+    SSCHECK(4);
+    SSPUSHPTR(SvREFCNT_inc(hv));
+    SSPUSHPTR(SvREFCNT_inc(key));
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
+    SSPUSHINT(SAVEt_HELEM);
+    save_scalar_at(sptr);
+}
+
+void
+save_op(void)
+{
+    dTHR;
+    SSCHECK(2);
+    SSPUSHPTR(op);
+    SSPUSHINT(SAVEt_OP);
+}
+
+void
+leave_scope(I32 base)
+{
+    dTHR;
     register SV *sv;
     register SV *value;
     register GV *gv;
     register AV *av;
     register HV *hv;
     register void* ptr;
+    I32 i;
 
     if (base < -1)
 	croak("panic: corrupt saved stack index");
@@ -432,12 +557,16 @@ I32 base;
 	    value = (SV*)SSPOPPTR;
 	    gv = (GV*)SSPOPPTR;
 	    ptr = &GvSV(gv);
+	    SvREFCNT_dec(gv);
 	    goto restore_sv;
         case SAVEt_SVREF:			/* scalar reference */
 	    value = (SV*)SSPOPPTR;
 	    ptr = SSPOPPTR;
 	restore_sv:
 	    sv = *(SV**)ptr;
+	    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
+				  "restore svref: %p %p:%s -> %p:%s\n",
+			  	  ptr, sv, SvPEEK(sv), value, SvPEEK(value)));
 	    if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv) &&
 		SvTYPE(sv) != SVt_PVGV)
 	    {
@@ -460,18 +589,43 @@ I32 base;
 	    localizing = 2;
 	    SvSETMAGIC(value);
 	    localizing = 0;
+	    SvREFCNT_dec(value);
             break;
         case SAVEt_AV:				/* array reference */
 	    av = (AV*)SSPOPPTR;
 	    gv = (GV*)SSPOPPTR;
-            SvREFCNT_dec(GvAV(gv));
+	    if (GvAV(gv)) {
+		AV *goner = GvAV(gv);
+		SvMAGIC(av) = SvMAGIC(goner);
+		SvFLAGS(av) |= SvMAGICAL(goner);
+		SvMAGICAL_off(goner);
+		SvMAGIC(goner) = 0;
+		SvREFCNT_dec(goner);
+	    }
             GvAV(gv) = av;
+	    if (SvMAGICAL(av)) {
+		localizing = 2;
+		SvSETMAGIC((SV*)av);
+		localizing = 0;
+	    }
             break;
         case SAVEt_HV:				/* hash reference */
 	    hv = (HV*)SSPOPPTR;
 	    gv = (GV*)SSPOPPTR;
-            SvREFCNT_dec(GvHV(gv));
+	    if (GvHV(gv)) {
+		HV *goner = GvHV(gv);
+		SvMAGIC(hv) = SvMAGIC(goner);
+		SvFLAGS(hv) |= SvMAGICAL(goner);
+		SvMAGICAL_off(goner);
+		SvMAGIC(goner) = 0;
+		SvREFCNT_dec(goner);
+	    }
             GvHV(gv) = hv;
+	    if (SvMAGICAL(hv)) {
+		localizing = 2;
+		SvSETMAGIC((SV*)hv);
+		localizing = 0;
+	    }
             break;
 	case SAVEt_INT:				/* int reference */
 	    ptr = SSPOPPTR;
@@ -513,9 +667,15 @@ I32 base;
 	    gv = (GV*)SSPOPPTR;
 	    (void)sv_clear((SV*)gv);
 	    break;
-        case SAVEt_GP:				/* scalar reference */
+	case SAVEt_GP:				/* scalar reference */
 	    ptr = SSPOPPTR;
 	    gv = (GV*)SSPOPPTR;
+            if (SvPOK(gv) && SvLEN(gv) > 0) {
+                Safefree(SvPVX(gv));
+            }
+            SvPVX(gv) = (char *)SSPOPPTR;
+            SvCUR(gv) = (STRLEN)SSPOPIV;
+            SvLEN(gv) = (STRLEN)SSPOPIV;
             gp_free(gv);
             GvGP(gv) = (GP*)ptr;
 	    SvREFCNT_dec(gv);
@@ -526,7 +686,8 @@ I32 base;
 	    break;
 	case SAVEt_FREEOP:
 	    ptr = SSPOPPTR;
-	    curpad = AvARRAY(comppad);
+	    if (comppad)
+		curpad = AvARRAY(comppad);
 	    op_free((OP*)ptr);
 	    break;
 	case SAVEt_FREEPV:
@@ -536,7 +697,8 @@ I32 base;
 	case SAVEt_CLEARSV:
 	    ptr = (void*)&curpad[SSPOPLONG];
 	    sv = *(SV**)ptr;
-	    if (SvREFCNT(sv) <= 1) { /* Can clear pad variable in place. */
+	    /* Can clear pad variable in place? */
+	    if (SvREFCNT(sv) <= 1 && !SvOBJECT(sv)) {
 		if (SvTHINKFIRST(sv)) {
 		    if (SvREADONLY(sv))
 			croak("panic: leave_scope clearsv");
@@ -556,24 +718,26 @@ I32 base;
 		    hv_clear((HV*)sv);
 		    break;
 		case SVt_PVCV:
-		    sub_generation++;
-		    cv_undef((CV*)sv);
+		    croak("panic: leave_scope pad code");
+		case SVt_RV:
+		case SVt_IV:
+		case SVt_NV:
+		    (void)SvOK_off(sv);
 		    break;
 		default:
-		    if (SvPOK(sv) && SvLEN(sv))
-			(void)SvOOK_off(sv);
 		    (void)SvOK_off(sv);
+		    (void)SvOOK_off(sv);
 		    break;
 		}
 	    }
 	    else {	/* Someone has a claim on this, so abandon it. */
 		U32 padflags = SvFLAGS(sv) & (SVs_PADBUSY|SVs_PADMY|SVs_PADTMP);
-		SvREFCNT_dec(sv);	/* Cast current value to the winds. */
 		switch (SvTYPE(sv)) {	/* Console ourselves with a new value */
 		case SVt_PVAV:	*(SV**)ptr = (SV*)newAV();	break;
 		case SVt_PVHV:	*(SV**)ptr = (SV*)newHV();	break;
 		default:	*(SV**)ptr = NEWSV(0,0);	break;
 		}
+		SvREFCNT_dec(sv);	/* Cast current value to the winds. */
 		SvFLAGS(*(SV**)ptr) |= padflags; /* preserve pad nature */
 	    }
 	    break;
@@ -582,23 +746,60 @@ I32 base;
 	    hv = (HV*)ptr;
 	    ptr = SSPOPPTR;
 	    (void)hv_delete(hv, (char*)ptr, (U32)SSPOPINT, G_DISCARD);
+	    SvREFCNT_dec(hv);
 	    Safefree(ptr);
 	    break;
 	case SAVEt_DESTRUCTOR:
 	    ptr = SSPOPPTR;
-	    (*SSPOPDPTR)(ptr);
+	    (CALLDESTRUCTOR)(ptr);
 	    break;
 	case SAVEt_REGCONTEXT:
-	    {
-		I32 delta = SSPOPINT;
-		savestack_ix -= delta;	/* regexp must have croaked */
-	    }
+	    i = SSPOPINT;
+	    savestack_ix -= i;  	/* regexp must have croaked */
 	    break;
 	case SAVEt_STACK_POS:		/* Position on Perl stack */
-	    {
-		I32 delta = SSPOPINT;
-		stack_sp = stack_base + delta;
+	    i = SSPOPINT;
+	    stack_sp = stack_base + i;
+	    break;
+	case SAVEt_AELEM:		/* array element */
+	    value = (SV*)SSPOPPTR;
+	    i = SSPOPINT;
+	    av = (AV*)SSPOPPTR;
+	    ptr = av_fetch(av,i,1);
+	    if (ptr) {
+		sv = *(SV**)ptr;
+		if (sv && sv != &sv_undef) {
+		    if (SvRMAGICAL(av) && mg_find((SV*)av, 'P'))
+			(void)SvREFCNT_inc(sv);
+		    SvREFCNT_dec(av);
+		    goto restore_sv;
+		}
+	    }
+	    SvREFCNT_dec(av);
+	    SvREFCNT_dec(value);
+	    break;
+	case SAVEt_HELEM:		/* hash element */
+	    value = (SV*)SSPOPPTR;
+	    sv = (SV*)SSPOPPTR;
+	    hv = (HV*)SSPOPPTR;
+	    ptr = hv_fetch_ent(hv, sv, 1, 0);
+	    if (ptr) {
+		SV *oval = HeVAL((HE*)ptr);
+		if (oval && oval != &sv_undef) {
+		    ptr = &HeVAL((HE*)ptr);
+		    if (SvRMAGICAL(hv) && mg_find((SV*)hv, 'P'))
+			(void)SvREFCNT_inc(*(SV**)ptr);
+		    SvREFCNT_dec(hv);
+		    SvREFCNT_dec(sv);
+		    goto restore_sv;
+		}
 	    }
+	    SvREFCNT_dec(hv);
+	    SvREFCNT_dec(sv);
+	    SvREFCNT_dec(value);
+	    break;
+	case SAVEt_OP:
+	    op = (OP*)SSPOPPTR;
 	    break;
 	default:
 	    croak("panic: leave_scope inconsistency");
@@ -606,13 +807,12 @@ I32 base;
     }
 }
 
-#ifdef DEBUGGING
-
 void
-cx_dump(cx)
-CONTEXT* cx;
+cx_dump(PERL_CONTEXT *cx)
 {
-    PerlIO_printf(Perl_debug_log, "CX %d = %s\n", cx - cxstack, block_type[cx->cx_type]);
+#ifdef DEBUGGING
+    dTHR;
+    PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), block_type[cx->cx_type]);
     if (cx->cx_type != CXt_SUBST) {
 	PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp);
 	PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%lx\n", (long)cx->blk_oldcop);
@@ -695,9 +895,9 @@ CONTEXT* cx;
 		(long)cx->sb_m);
 	PerlIO_printf(Perl_debug_log, "SB_STREND = 0x%lx\n",
 		(long)cx->sb_strend);
-	PerlIO_printf(Perl_debug_log, "SB_SUBBASE = 0x%lx\n",
-		(long)cx->sb_subbase);
+	PerlIO_printf(Perl_debug_log, "SB_RXRES = 0x%lx\n",
+		(long)cx->sb_rxres);
 	break;
     }
+#endif	/* DEBUGGING */
 }
-#endif