oelemfast: rewrite

Author: rurban

op.c

@@ -23456,6 +23456,7 @@ S_do_method_finalize(pTHX_ const HV *klass, const CV* cv,
                             SVfARG(cv_name((CV*)cv, NULL, CV_NAME_NOMAIN)),
                             SvPVX(meth), (int)self, (int)ix));
                         f->op_targ = self;
+                        /* keeps OPf_MOD */
                         OpTYPE_set(f, OP_OELEMFAST); /* PUSHMARK is the bb leader,
                                                         not ENTERSUB. Some next might point
                                                         to it */

opcode.h

@@ -1014,7 +1014,7 @@ PL_op_type_str[] = {
 	"(:Scalar,:Scalar):Scalar",	/* 13: sassign */
 	"(:List,:List):List",	/* 14: aassign */
 	"(:Ref,:Str):Any",	/* 15: oelem */
-	"(:Ref,:Int):Any",	/* 16: oelemfast */
+	"():Any",	/* 16: oelemfast */
 	"(:List(:Str)):Scalar",	/* 17: chop */
 	"(:Str):Int",	/* 18: schop */
 	"(:List(:Str)):Scalar",	/* 19: chomp */
@@ -1443,7 +1443,7 @@ EXTCONST U32 PL_op_type[] = {
 	0x0b0bff0b,	/* 13: sassign "(:Scalar,:Scalar):Scalar" */
 	0x1212ff12,	/* 14: aassign "(:List,:List):List" */
 	0x0c08ff13,	/* 15: oelem "(:Ref,:Str):Any" */
-	0x0c05ff13,	/* 16: oelemfast "(:Ref,:Int):Any" */
+	0xffffff13,	/* 16: oelemfast "():Any" */
 	0xa8ffff0b,	/* 17: chop "(:List(:Str)):Scalar" */
 	0x08ffff05,	/* 18: schop "(:Str):Int" */
 	0xa8ffff0b,	/* 19: chomp "(:List(:Str)):Scalar" */
@@ -3188,7 +3188,7 @@ EXTCONST U32 PL_opargs[] = {
 	0x00044804,	/* sassign */
 	0x00088808,	/* aassign */
 	0x0005c800,	/* oelem */
-	0x0021c000,	/* oelemfast */
+	0x00000000,	/* oelemfast */
 	0x0000a80d,	/* chop */
 	0x0002688c,	/* schop */
 	0x0000a81d,	/* chomp */

pp.c

@@ -373,54 +373,44 @@ PPt(pp_oelem, "(:Ref,:Str):Any")
    ditto ix for a valid field index.
    fields may be also arrays or hashes.
  */
-PPt(pp_oelemfast, "(:Ref,:Int):Any")
+PPt(pp_oelemfast, "():Any")
 {
     dSP;
-    SV * const obj = PAD_SVl(PL_op->op_targ);
-    const U8 ix    = PL_op->op_private;
-    const bool lvalue = cBOOL((PL_op->op_flags & OPf_MOD || LVRET));
-    /*HV * klass;
+    SV * const obj  = SvRV(PAD_SVl(PL_op->op_targ));
+    const U8   ix   = PL_op->op_private;
+    const bool lval = PL_op->op_flags & OPf_MOD;
+    SV** ary;
+    HV * klass;
 
-    if (UNLIKELY(!obj || SvOBJECT(obj) || !(klass = SvSTASH(obj)) || !SvOOK(klass)
-                 || !SvROK(obj) || SvTYPE(SvRV(obj)) != SVt_PVAV))
+#ifdef DEBUGGING
+    if (UNLIKELY(!obj || !SvOBJECT(obj) || !(klass = SvSTASH(obj)) || !SvOOK(klass)
+                 || SvTYPE(obj) != SVt_PVAV))
         DIE(aTHX_ "Invalid object");
     if (UNLIKELY(!HvCLASS(klass))) {
         const char *name = HvNAME_get(klass) ? HEK_KEY(HvNAME_HEK_NN(klass)) : "__ANON__";
         Perl_die(aTHX_ "Not a class %s", name);
-    }*/
-    EXTEND(SP, 1);
-    PUSHs(AvARRAY(MUTABLE_AV(SvRV(obj)))[ix]);
-    if (lvalue && !TOPs) {
-        HV *klass = SvSTASH(obj);
-#if 0
-        GV *fields;
-        SV *name = newSVpvn_flags(HvNAME(klass), HvNAMELEN(klass),
-                                  HvNAMEUTF8(klass)|SVs_TEMP);
-        /*SV *name = newSVhek(HvNAME_HEK_NN(klass));*/
-        assert(HvCLASS(klass));
-        sv_catpvs(name, "::FIELDS");
-        fields = gv_fetchsv(name, 0, SVt_PVAV);
-        assert(fields && GvAV(fields));
-        {
-            SV *pad = AvARRAY(GvAV(fields))[ix];
-            const PADOFFSET po = SvIVX(pad);
-            assert(SvIOK(pad));
+    }
 #else
-        assert(HvCLASS(klass));
-        {
-            const PADOFFSET po = field_index(klass, ix);
+    klass = SvSTASH(obj);
 #endif
-            const PADNAME* pn = PAD_COMPNAME(po);
-            /* XXX typed? */
-
-            if (*PadnamePV(pn) == '$')
-                PUSHs(newSV(0));
-            else if (*PadnamePV(pn) == '@')
-                PUSHs(newSV_type(SVt_PVAV));
-            else if (*PadnamePV(pn) == '%')
-                PUSHs(newSV_type(SVt_PVHV));
-        }
+    EXTEND(SP, 1);
+    assert(HvCLASS(klass));
+    ary = AvARRAY(MUTABLE_AV(obj));
+    assert(ary);
+    if (lval && !ary[ix]) { /* init NULL value */
+        const PADOFFSET po = field_index(klass, ix);
+        const char c = *PAD_COMPNAME_PV(po);
+        /* XXX typed? */
+        if (c == '$')
+            ary[ix] = newSV(0);
+        else if (c == '@')
+            ary[ix] = newSV_type(SVt_PVAV);
+        else if (c == '%')
+            ary[ix] = newSV_type(SVt_PVHV);
+        PUSHs(ary[ix]);
+        RETURN;
     }
+    PUSHs(ary[ix] ? ary[ix] : UNDEF);
     RETURN;
 }
 

regen/opcodes

@@ -66,7 +66,7 @@ padany		private value		ck_null		d0		"():Void"
 sassign		scalar assignment	ck_sassign	s2	S S	"(:Scalar,:Scalar):Scalar"
 aassign		list assignment		ck_aassign	t2	L L	"(:List,:List):List"
 oelem		object element		ck_null		2	R S	"(:Ref,:Str):Any"
-oelemfast	constant object element	ck_null		0	R I	"(:Ref,:Int):Any"
+oelemfast	constant object element	ck_null		0		"():Any"
 
 chop		chop			ck_spair	mts%	L	"(:List(:Str)):Scalar"
 schop		scalar chop		ck_null		stu%	S?	"(:Str):Int"