add CX_POP(cx) macro: glorified cxstack_ix--

but with extra checking goodness on debugging builds.

1 files changed, 4 insertions, 2 deletions

diff --git a/pp_hot.c b/pp_hot.c
index 5f2523ca37..013eb981e6 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -3273,6 +3273,7 @@ PP(pp_leavesub)
     SV **newsp;
     I32 gimme;
     PERL_CONTEXT *cx;
+    OP *retop;
 
     cx = &cxstack[cxstack_ix];
     assert(CxTYPE(cx) == CXt_SUB);
@@ -3339,9 +3340,10 @@ PP(pp_leavesub)
     CX_LEAVE_SCOPE(cx);
     POPSUB(cx);	/* Stack values are safe: release CV and @_ ... */
     POPBLOCK(cx);
-    cxstack_ix--;
+    retop = cx->blk_sub.retop;
+    CX_POP(cx);
 
-    return cx->blk_sub.retop;
+    return retop;
 }