handy.h: Speed up isIDFIRST_utf8()

[perl5.git] / doop.c

diff --git a/doop.c b/doop.c
index 4e0d9e3..e31fae2 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -1224,8 +1224,7 @@ Perl_do_kv(pTHX)
 {
     dVAR;
     dSP;
-    HV * const hv = MUTABLE_HV(POPs);
-    HV *keys;
+    HV * const keys = MUTABLE_HV(POPs);
     register HE *entry;
     const I32 gimme = GIMME_V;
     const I32 dokv =     (PL_op->op_type == OP_RV2HV || PL_op->op_type == OP_PADHV);
@@ -1233,17 +1232,6 @@ Perl_do_kv(pTHX)
     const I32 dokeys =   dokv || (PL_op->op_type == OP_KEYS || PL_op->op_type == OP_RKEYS);
     const I32 dovalues = dokv || (PL_op->op_type == OP_VALUES || PL_op->op_type == OP_RVALUES);
 
-    if (!hv) {
-       if (PL_op->op_flags & OPf_MOD || LVRET) {       /* lvalue */
-           dTARGET;            /* make sure to clear its target here */
-           if (SvTYPE(TARG) == SVt_PVLV)
-               LvTARG(TARG) = NULL;
-           PUSHs(TARG);
-       }
-       RETURN;
-    }
-
-    keys = hv;
     (void)hv_iterinit(keys);   /* always reset iterator regardless */
 
     if (gimme == G_VOID)
@@ -1262,7 +1250,7 @@ Perl_do_kv(pTHX)
            dTARGET;
 
            if (! SvTIED_mg((const SV *)keys, PERL_MAGIC_tied) ) {
-               i = HvKEYS(keys);
+               i = HvUSEDKEYS(keys);
            }
            else {
                i = 0;
@@ -1273,7 +1261,7 @@ Perl_do_kv(pTHX)
        RETURN;
     }
 
-    EXTEND(SP, HvKEYS(keys) * (dokeys + dovalues));
+    EXTEND(SP, HvUSEDKEYS(keys) * (dokeys + dovalues));
 
     PUTBACK;   /* hv_iternext and hv_iterval might clobber stack_sp */
     while ((entry = hv_iternext(keys))) {
@@ -1285,7 +1273,7 @@ Perl_do_kv(pTHX)
        if (dovalues) {
            SV *tmpstr;
            PUTBACK;
-           tmpstr = hv_iterval(hv,entry);
+           tmpstr = hv_iterval(keys,entry);
            DEBUG_H(Perl_sv_setpvf(aTHX_ tmpstr, "%lu%%%d=%lu",
                            (unsigned long)HeHASH(entry),
                            (int)HvMAX(keys)+1,