diff options
| author | David Mitchell <davem@iabyn.com> | 2012-11-29 11:37:08 +0000 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2012-12-04 10:22:20 +0000 |
| commit | b492a59ed90fecea7508c6bc9601fb08e0212721 (patch) | |
| tree | 2ffd98b7627093fd896f40ee77ace420f4d684e8 /scope.c | |
| parent | 03dba56127506a6979ee0298da57d71840dee39d (diff) | |
| download | perl-b492a59ed90fecea7508c6bc9601fb08e0212721.tar.gz | |
Optimise magic handling in save* and leave_scope
There are several places that have code similar to
if (SvMAGICAL(sv)) {
PL_localizing = 2;
SvSETMAGIC(sv)
PL_localizing = 0;
}
The condition is sub-optimal (it should only test for set magic), and the
SvSETMAGIC repeats a similar test.
Other places didn't have the outer condition, so they set PL_localizing
twice even when not needed.
Diffstat (limited to 'scope.c')
| -rw-r--r-- | scope.c | 44 |
1 files changed, 25 insertions, 19 deletions
@@ -214,9 +214,11 @@ Perl_save_scalar(pTHX_ GV *gv) PERL_ARGS_ASSERT_SAVE_SCALAR; - PL_localizing = 1; - SvGETMAGIC(*sptr); - PL_localizing = 0; + if (SvGMAGICAL(*sptr)) { + PL_localizing = 1; + (void)mg_get(*sptr); + PL_localizing = 0; + } save_pushptrptr(SvREFCNT_inc_simple(gv), SvREFCNT_inc(*sptr), SAVEt_SV); return save_scalar_at(sptr, SAVEf_SETMAGIC); /* XXX - FIXME - see #60360 */ } @@ -808,9 +810,11 @@ Perl_leave_scope(pTHX_ I32 base) switch (type) { case SAVEt_ITEM: /* normal string */ sv_replace(ARG1_SV, ARG0_SV); - PL_localizing = 2; - SvSETMAGIC(ARG1_SV); - PL_localizing = 0; + if (SvSMAGICAL(ARG1_SV)) { + PL_localizing = 2; + mg_set(ARG1_SV); + PL_localizing = 0; + } break; /* This would be a mathom, but Perl_save_svref() calls a static @@ -828,9 +832,11 @@ Perl_leave_scope(pTHX_ I32 base) SV * const sv = *svp; *svp = ARG0_SV; SvREFCNT_dec(sv); - PL_localizing = 2; - SvSETMAGIC(ARG0_SV); - PL_localizing = 0; + if (SvSMAGICAL(ARG0_SV)) { + PL_localizing = 2; + mg_set(ARG0_SV); + PL_localizing = 0; + } SvREFCNT_dec(ARG0_SV); SvREFCNT_dec(refsv); break; @@ -884,21 +890,21 @@ Perl_leave_scope(pTHX_ I32 base) case SAVEt_AV: /* array reference */ SvREFCNT_dec(GvAV(ARG1_GV)); GvAV(ARG1_GV) = ARG0_AV; - if (SvMAGICAL(ARG0_AV)) { - PL_localizing = 2; - SvSETMAGIC(MUTABLE_SV(ARG0_AV)); - PL_localizing = 0; - } + if (SvSMAGICAL(ARG0_SV)) { + PL_localizing = 2; + mg_set(ARG0_SV); + PL_localizing = 0; + } SvREFCNT_dec(ARG1_GV); break; case SAVEt_HV: /* hash reference */ SvREFCNT_dec(GvHV(ARG1_GV)); GvHV(ARG1_GV) = ARG0_HV; - if (SvMAGICAL(ARG0_HV)) { - PL_localizing = 2; - SvSETMAGIC(MUTABLE_SV(ARG0_HV)); - PL_localizing = 0; - } + if (SvSMAGICAL(ARG0_SV)) { + PL_localizing = 2; + mg_set(ARG0_SV); + PL_localizing = 0; + } SvREFCNT_dec(ARG1_GV); break; case SAVEt_INT_SMALL: |