1 files changed, 14 insertions, 2 deletions
diff --git a/pp_ctl.c b/pp_ctl.c
index ea83d1805b..c4aa30ed72 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2681,7 +2681,6 @@ S_docatch(pTHX_ OP *o)
 {
     int ret;
     OP * const oldop = PL_op;
-    volatile PERL_SI *cursi = PL_curstackinfo;
     dJMPENV;
 
 #ifdef DEBUGGING
@@ -2692,12 +2691,25 @@ S_docatch(pTHX_ OP *o)
     JMPENV_PUSH(ret);
     switch (ret) {
     case 0:
+	assert(cxstack_ix >= 0);
+	assert(CxTYPE(&cxstack[cxstack_ix]) == CXt_EVAL);
+	cxstack[cxstack_ix].blk_eval.cur_top_env = PL_top_env;
  redo_body:
 	docatch_body();
 	break;
     case 3:
 	/* die caught by an inner eval - continue inner loop */
-	if (PL_restartop && cursi == PL_curstackinfo) {
+
+	/* NB XXX we rely on the old popped CxEVAL still being at the top
+	 * of the stack; the way die_where() currently works, this
+	 * assumption is valid. In theory The cur_top_env value should be
+	 * returned in another global, the way retop (aka PL_restartop)
+	 * is. */
+	assert(CxTYPE(&cxstack[cxstack_ix+1]) == CXt_EVAL);
+
+	if (PL_restartop
+	    && cxstack[cxstack_ix+1].blk_eval.cur_top_env == PL_top_env)
+	{
 	    PL_op = PL_restartop;
 	    PL_restartop = 0;
 	    goto redo_body;