diff options
| author | David Mitchell <davem@iabyn.com> | 2015-07-17 22:23:51 +0100 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2016-02-03 08:59:38 +0000 |
| commit | adcbf1182122d17f378d2c30e3182991bdf754cd (patch) | |
| tree | 68cae5f56fcfaea491334b967f88d5aadaadada0 /cop.h | |
| parent | 3eb5c03d291640740f1aba63e5978084371a560c (diff) | |
| download | perl-adcbf1182122d17f378d2c30e3182991bdf754cd.tar.gz | |
CXt_EVAL: save savestack_ix and tmps_floor in CX
In the various places that do PUSHEVAL (eval, require etc), eliminate
ENTER; SAVETMPS
and instead save the old values of PL_savestack_ix and PL_tmps_floor
directly in the eval context frame, similarly to how subs have been
recently changed.
This is faster and cleaner.
Diffstat (limited to 'cop.h')
| -rw-r--r-- | cop.h | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -550,9 +550,9 @@ be zero. /* subroutine context */ struct block_sub { OP * retop; /* op to execute on exit from sub */ - /* Above here is the same for sub, format and eval. */ I32 old_savestack_ix; /* saved PL_savestack_ix (also CXt_NULL) */ SSize_t old_tmpsfloor; /* also used in CXt_NULL sort block */ + /* Above here is the same for sub, format and eval. */ PAD *prevcomppad; /* the caller's PL_comppad */ CV * cv; /* Above here is the same for sub and format. */ @@ -564,9 +564,9 @@ struct block_sub { /* format context */ struct block_format { OP * retop; /* op to execute on exit from sub */ - /* Above here is the same for sub, format and eval. */ I32 old_savestack_ix; /* saved PL_savestack_ix (also CXt_NULL) */ SSize_t old_tmpsfloor; /* also used in CXt_NULL sort block */ + /* Above here is the same for sub, format and eval. */ PAD *prevcomppad; /* the caller's PL_comppad */ CV * cv; /* Above here is the same for sub and format. */ @@ -709,6 +709,8 @@ struct block_format { /* eval context */ struct block_eval { OP * retop; /* op to execute on exit from eval */ + I32 old_savestack_ix; /* saved PL_savestack_ix (also CXt_NULL) */ + SSize_t old_tmpsfloor; /* also used in CXt_NULL sort block */ /* Above here is the same for sub, format and eval. */ SV * old_namesv; OP * old_eval_root; @@ -729,6 +731,8 @@ struct block_eval { assert(!(PL_in_eval & ~0x7F)); \ assert(!(PL_op->op_type & ~0x1FF)); \ cx->blk_u16 = (PL_in_eval & 0x7F) | ((U16)PL_op->op_type << 7); \ + cx->blk_eval.old_tmpsfloor = PL_tmps_floor; \ + PL_tmps_floor = PL_tmps_ix; \ cx->blk_eval.old_namesv = (n ? newSVpv(n,0) : NULL); \ cx->blk_eval.old_eval_root = PL_eval_root; \ cx->blk_eval.cur_text = PL_parser ? PL_parser->linestr : NULL; \ |