From b042e3289b4fb004aeb597fff6026d9df30aee80 Mon Sep 17 00:00:00 2001
From: David Mitchell <davem@iabyn.com>
Date: Thu, 15 Oct 2015 11:34:41 +0100
Subject: do PL_tmps_floor restore in POPBLOCK

Currently every individual POPFOO type does

    PL_tmps_floor = cx->cx_u.cx_blk.blku_old_tmpsfloor

as its last action.

Move all these into POPBLOCK instead, which always immediately follows
the  POPFOO.
---
 pp_sort.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pp_sort.c')

diff --git a/pp_sort.c b/pp_sort.c
index 706e2d6475..352be9953f 100644
--- a/pp_sort.c
+++ b/pp_sort.c
@@ -1712,11 +1712,10 @@ PP(pp_sort)
                 assert(CxTYPE(cx) == CXt_SUB);
                 POPSUB(cx);
 	    }
-            else
+            else {
                 assert(CxTYPE(cx) == CXt_NULL);
-                /* mimic POPSUB */
                 CX_LEAVE_SCOPE(cx);
-                PL_tmps_floor = cx->cx_u.cx_blk.blku_old_tmpsfloor;
+            }
 
 	    POPBLOCK(cx);
             cxstack_ix--;
-- 
cgit v1.2.1