2 files changed, 17 insertions, 8 deletions

diff --git a/op.c b/op.c
index ecd625902a..15ced90de2 100644
--- a/op.c
+++ b/op.c
@@ -4258,12 +4258,12 @@ S_fold_constants(pTHX_ OP *o)
     bool is_stringify;
     SV * VOL sv = NULL;
     int ret = 0;
-    I32 oldscope;
     OP *old_next;
     SV * const oldwarnhook = PL_warnhook;
     SV * const olddiehook  = PL_diehook;
     COP not_compiling;
     U8 oldwarn = PL_dowarn;
+    I32 old_cxix;
     dJMPENV;
 
     PERL_ARGS_ASSERT_FOLD_CONSTANTS;
@@ -4344,7 +4344,7 @@ S_fold_constants(pTHX_ OP *o)
     o->op_next = 0;
     PL_op = curop;
 
-    oldscope = PL_scopestack_ix;
+    old_cxix = cxstack_ix;
     create_eval_scope(G_FAKINGEVAL);
 
     /* Verify that we don't need to save it:  */
@@ -4396,9 +4396,13 @@ S_fold_constants(pTHX_ OP *o)
     PL_diehook  = olddiehook;
     PL_curcop = &PL_compiling;
 
-    if (PL_scopestack_ix > oldscope)
-	delete_eval_scope();
-
+    /* if we croaked, depending on how we croaked the eval scope
+     * may or may not have already been popped */
+    if (cxstack_ix > old_cxix) {
+        assert(cxstack_ix == old_cxix + 1);
+        assert(CxTYPE(&cxstack[cxstack_ix]) == CXt_EVAL);
+        delete_eval_scope();
+    }
     if (ret)
 	goto nope;
 
diff --git a/perl.c b/perl.c
index 1d94b38777..a7938bd774 100644
--- a/perl.c
+++ b/perl.c
@@ -2711,7 +2711,6 @@ Perl_call_sv(pTHX_ SV *sv, VOL I32 flags)
     METHOP method_op;
     I32 oldmark;
     VOL I32 retval = 0;
-    I32 oldscope;
     bool oldcatch = CATCH_GET;
     int ret;
     OP* const oldop = PL_op;
@@ -2743,7 +2742,6 @@ Perl_call_sv(pTHX_ SV *sv, VOL I32 flags)
 	PUTBACK;
     }
     oldmark = TOPMARK;
-    oldscope = PL_scopestack_ix;
 
     if (PERLDB_SUB && PL_curstash != PL_debstash
 	   /* Handle first BEGIN of -d. */
@@ -2777,8 +2775,10 @@ Perl_call_sv(pTHX_ SV *sv, VOL I32 flags)
 	CATCH_SET(oldcatch);
     }
     else {
+        I32 old_cxix;
 	myop.op_other = (OP*)&myop;
 	(void)POPMARK;
+        old_cxix = cxstack_ix;
 	create_eval_scope(flags|G_FAKINGEVAL);
 	(void)INCMARK;
 
@@ -2820,8 +2820,13 @@ Perl_call_sv(pTHX_ SV *sv, VOL I32 flags)
 	    break;
 	}
 
-	if (PL_scopestack_ix > oldscope)
+        /* if we croaked, depending on how we croaked the eval scope
+         * may or may not have already been popped */
+	if (cxstack_ix > old_cxix) {
+            assert(cxstack_ix == old_cxix + 1);
+            assert(CxTYPE(&cxstack[cxstack_ix]) == CXt_EVAL);
 	    delete_eval_scope();
+        }
 	JMPENV_POP;
     }