diff options
author | Nicholas Clark <nick@ccl4.org> | 2008-01-25 10:06:08 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2008-01-25 10:06:08 +0000 |
commit | 267cc4a8114e05742ba94bb40aa5728a5cfaa166 (patch) | |
tree | 5ea94eb29f58724c012937dff99f5fc9fd83a6da | |
parent | 3bf7733be4441d517a5d743fcbf21dd0ad133d67 (diff) | |
download | perl-267cc4a8114e05742ba94bb40aa5728a5cfaa166.tar.gz |
Using PL_sv_no in place of any !SvOK() maximum removes a little bit of
hot code in pp_iter.
p4raw-id: //depot/perl@33068
-rw-r--r-- | pp_ctl.c | 8 | ||||
-rw-r--r-- | pp_hot.c | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -1922,7 +1922,15 @@ PP(pp_enteriter) else { cx->blk_loop.lval_max_u.iterlval = newSVsv(sv); (void) SvPV_force_nolen(cx->blk_loop.lval_max_u.iterlval); + /* This will do the upgrade to SVt_PV, and warn if the value + is uninitialised. */ (void) SvPV_nolen_const(right); + /* Doing this avoids a check every time in pp_iter in pp_hot.c + to replace !SvOK() with a pointer to "". */ + if (!SvOK(right)) { + SvREFCNT_dec(right); + cx->blk_loop.ary_min_u.iterary = (AV*) &PL_sv_no; + } } } else if (PL_op->op_private & OPpITER_REVERSED) { @@ -1918,10 +1918,10 @@ PP(pp_iter) if (CxTYPE(cx) != CXt_LOOP_LAZYIV) { /* string increment */ register SV* cur = cx->blk_loop.lval_max_u.iterlval; + /* If the maximum is !SvOK(), pp_enteriter substitutes PL_sv_no. + It has SvPVX of "" and SvCUR of 0, which is what we want. */ STRLEN maxlen = 0; - const char *max = - SvOK((SV*)av) ? - SvPV_const((SV*)av, maxlen) : (const char *)""; + const char *max = SvPV_const((SV*)av, maxlen); if (!SvNIOK(cur) && SvCUR(cur) <= maxlen) { if (SvREFCNT(*itersvp) == 1 && !SvMAGICAL(*itersvp)) { /* safe to reuse old SV */ |