diff options
author | David Mitchell <davem@iabyn.com> | 2010-05-25 11:38:35 +0100 |
---|---|---|
committer | David Mitchell <davem@iabyn.com> | 2010-05-25 12:44:16 +0100 |
commit | 0824d66743a706cd268ace8fc9df03d7374c6886 (patch) | |
tree | 7900aed8090cd6e812a8b8ee3156edf8e364bb81 /pp_hot.c | |
parent | bb1bc619ea68d9703fbd3fe5bc65ae000f90151f (diff) | |
download | perl-0824d66743a706cd268ace8fc9df03d7374c6886.tar.gz |
add OPpDEREFed flag to avoid double mg_get()
The previous commit made various ops such as rv2av unconditionally do
an SvGETMAGIC(). Under some circumstances this could cause a double
mg_get() (and hence double FETCH etc). In particular, when the
proceeding op was something like aelem with OPpDEREF, the aelem would
call vivify_ref(), which would call magic. So in peep(), mark
OP_RV2[SAH]V ops with the new OPpDEREFed flag if the preceding op was
OPpDEREF. Then use this flag to avoid a second dose of magic.
Note that RV2GV probably needs this flag too, but there weren't any
spare private flag bits left for that op (I think).
Diffstat (limited to 'pp_hot.c')
-rw-r--r-- | pp_hot.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -820,7 +820,8 @@ PP(pp_rv2av) const bool is_pp_rv2av = PL_op->op_type == OP_RV2AV; const svtype type = is_pp_rv2av ? SVt_PVAV : SVt_PVHV; - SvGETMAGIC(sv); + if (!(PL_op->op_private & OPpDEREFed)) + SvGETMAGIC(sv); if (SvROK(sv)) { tryAMAGICunDEREF_var(is_pp_rv2av ? to_av_amg : to_hv_amg); |