diff options
| author | David Mitchell <davem@iabyn.com> | 2015-10-10 23:01:55 +0100 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2016-02-03 08:59:41 +0000 |
| commit | 03e489bcdcb26b30f46b618f9ffe9e97d6ef7d7c (patch) | |
| tree | 9948d6f62d01c89d4647e1e0cbc9f20434f50ec6 /pp_ctl.c | |
| parent | dfe0f39bc171d865e84f3c67b96f42ecd95ac752 (diff) | |
| download | perl-03e489bcdcb26b30f46b618f9ffe9e97d6ef7d7c.tar.gz | |
move CX_LEAVE_SCOPE into POPEVAL
All the other POPFOO types have CX_LEAVE_SCOPE as their first action.
Add it as the first action of POPEVAL too, and remove all the explicit
calls to CX_LEAVE_SCOPE dotted around near POPEVALs.
Note that this causes a slight change in behaviour in dounwind:
the CX_LEAVE_SCOPE is now done as the first action of POPEVAL there
rather than being done afterwards. This is now consistence will all other
uses of POPEVAL.
Diffstat (limited to 'pp_ctl.c')
| -rw-r--r-- | pp_ctl.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1521,7 +1521,8 @@ Perl_dounwind(pTHX_ I32 cxix) break; case CXt_EVAL: POPEVAL(cx); - /* FALLTHROUGH */ + PL_tmps_floor = cx->cx_u.cx_blk.blku_old_tmpsfloor; + break; case CXt_BLOCK: POPBASICBLK(cx); break; @@ -1659,7 +1660,6 @@ Perl_die_unwind(pTHX_ SV *msv) } POPBLOCK(cx,PL_curpm); - CX_LEAVE_SCOPE(cx); POPEVAL(cx); namesv = cx->blk_eval.old_namesv; #ifdef DEBUGGING @@ -3444,7 +3444,6 @@ S_doeval(pTHX_ int gimme, CV* outside, U32 seq, HV *hh) } SP = PL_stack_base + POPMARK; /* pop original mark */ POPBLOCK(cx,PL_curpm); - CX_LEAVE_SCOPE(cx); POPEVAL(cx); namesv = cx->blk_eval.old_namesv; /* POPBLOCK has rendered LEAVE_with_name("evalcomp") unnecessary */ @@ -4283,7 +4282,6 @@ PP(pp_leaveeval) if (gimme != G_VOID) SP = leave_common(newsp, SP, newsp, gimme, SVs_TEMP, FALSE); POPBLOCK(cx,newpm); - CX_LEAVE_SCOPE(cx); POPEVAL(cx); namesv = cx->blk_eval.old_namesv; retop = cx->blk_eval.retop; @@ -4328,7 +4326,6 @@ Perl_delete_eval_scope(pTHX) I32 optype; POPBLOCK(cx,newpm); - CX_LEAVE_SCOPE(cx); POPEVAL(cx); PL_curpm = newpm; PL_tmps_floor = cx->cx_u.cx_blk.blku_old_tmpsfloor; @@ -4388,7 +4385,6 @@ PP(pp_leavetry) SVs_PADTMP|SVs_TEMP, FALSE); POPBLOCK(cx,newpm); retop = cx->blk_eval.retop; - CX_LEAVE_SCOPE(cx); POPEVAL(cx); PERL_UNUSED_VAR(optype); |