move CX_LEAVE_SCOPE outside the POPFOO's

Currently every POPFOO macro has CX_LEAVE_SCOPE(cx) as its first action.
Since this is common code and not specific to a particular POPFOO type,
remove it from each POPFOO macro and make each caller of POPFOO explicitly
call CX_LEAVE_SCOPE() instead.

This should make no functional difference (but will help if you're
single-stepping the code in a debugger :-)

1 files changed, 3 insertions, 3 deletions

diff --git a/pp_sort.c b/pp_sort.c
index 1d6f7d6a95..63214b9487 100644
--- a/pp_sort.c
+++ b/pp_sort.c
@@ -1703,14 +1703,14 @@ PP(pp_sort)
 
 	    PL_stack_sp = PL_stack_base + cx->blk_oldsp;
 
+            CX_LEAVE_SCOPE(cx);
 	    if (!(flags & OPf_SPECIAL)) {
                 assert(CxTYPE(cx) == CXt_SUB);
                 POPSUB(cx);
 	    }
-            else {
+            else
                 assert(CxTYPE(cx) == CXt_NULL);
-                CX_LEAVE_SCOPE(cx);
-            }
+                /* there isn't a POPNULL ! */
 
 	    POPBLOCK(cx);
             cxstack_ix--;