expand tryAMAGICunTARGETlist() macro

This long macro is only used in two places (pp_readline and pp_glob).
Expand the contents of this macro directly in those two functions.

This will make it easier to individually unwrap (i.e. remove
PP_wrapped()) those two functions.

Shouldn't be any functional change.

Author: iabyn

pp.h

@@ -681,6 +681,8 @@ Does not use C<TARG>.  See also C<L</XPUSHu>>, C<L</mPUSHu>> and C<L</PUSHu>>.
 /* No longer used in core. Use AMG_CALLunary instead */
 #define AMG_CALLun(sv,meth) AMG_CALLunary(sv, CAT2(meth,_amg))
 
+/* No longer used in core. Was expanded directly into its only two users,
+ * pp_readline and pp_glob */
 #define tryAMAGICunTARGETlist(meth, jump)			\
     STMT_START {						\
         dSP;							\

pp_hot.c

@@ -1497,7 +1497,41 @@ PP_wrapped(pp_readline, ((PL_op->op_flags & OPf_STACKED) ? 2 : 1), 0)
      * CORE::readline() */
     if (TOPs) {
         SvGETMAGIC(TOPs);
-        tryAMAGICunTARGETlist(iter_amg, 0);
+
+        /* unrolled tryAMAGICunTARGETlist(iter_amg, 0) */
+        SV *tmpsv;
+        SV *arg= *sp;
+        U8 gimme = GIMME_V;
+        if (UNLIKELY(SvAMAGIC(arg) &&
+            (tmpsv = amagic_call(arg, &PL_sv_undef, iter_amg,
+                                 AMGf_want_list | AMGf_noright
+                                |AMGf_unary))))
+        {
+            SPAGAIN;
+            if (gimme == G_VOID) {
+                NOOP;
+            }
+            else if (gimme == G_LIST) {
+                SSize_t i;
+                SSize_t len;
+                assert(SvTYPE(tmpsv) == SVt_PVAV);
+                len = av_count((AV *)tmpsv);
+                (void)POPs; /* get rid of the arg */
+                EXTEND(sp, len);
+                for (i = 0; i < len; ++i)
+                    PUSHs(av_shift((AV *)tmpsv));
+            }
+            else { /* AMGf_want_scalar */
+                dATARGET; /* just use the arg's location */
+                sv_setsv(TARG, tmpsv);
+                if (PL_op->op_flags & OPf_STACKED)
+                    sp--;
+                SETTARG;
+            }
+            PUTBACK;
+            return NORMAL;
+        }
+
         PL_last_in_gv = MUTABLE_GV(*PL_stack_sp--);
     }
     else PL_last_in_gv = PL_argvgv, PL_stack_sp--;

pp_sys.c

@@ -351,7 +351,49 @@ PP_wrapped(pp_glob, 1 + !(PL_op->op_flags & OPf_SPECIAL), 0)
      * is called once and only once */
     if (SvGMAGICAL(TOPs)) TOPs = sv_2mortal(newSVsv(TOPs));
 
-    tryAMAGICunTARGETlist(iter_amg, (PL_op->op_flags & OPf_SPECIAL));
+    /* unrolled
+      tryAMAGICunTARGETlist(iter_amg, (PL_op->op_flags & OPf_SPECIAL)); */
+    SV *tmpsv;
+    SV *arg= *sp;
+    U8 gimme = GIMME_V;
+    if (UNLIKELY(SvAMAGIC(arg) &&
+        (tmpsv = amagic_call(arg, &PL_sv_undef, iter_amg,
+                             AMGf_want_list | AMGf_noright
+                            |AMGf_unary))))
+    {
+        SPAGAIN;
+        if (gimme == G_VOID) {
+            NOOP;
+        }
+        else if (gimme == G_LIST) {
+            SSize_t i;
+            SSize_t len;
+            assert(SvTYPE(tmpsv) == SVt_PVAV);
+            len = av_count((AV *)tmpsv);
+            (void)POPs; /* get rid of the arg */
+            EXTEND(sp, len);
+            for (i = 0; i < len; ++i)
+                PUSHs(av_shift((AV *)tmpsv));
+        }
+        else { /* AMGf_want_scalar */
+            dATARGET; /* just use the arg's location */
+            sv_setsv(TARG, tmpsv);
+            if (PL_op->op_flags & OPf_STACKED)
+                sp--;
+            SETTARG;
+        }
+        PUTBACK;
+        if (PL_op->op_flags & OPf_SPECIAL) {
+            OP *jump_o = NORMAL->op_next;
+            while (jump_o->op_type == OP_NULL)
+                jump_o = jump_o->op_next;
+            assert(jump_o->op_type == OP_ENTERSUB);
+            (void)POPMARK;
+            return jump_o->op_next;
+        }
+        return NORMAL;
+    }
+
 
     if (PL_op->op_flags & OPf_SPECIAL) {
         /* call Perl-level glob function instead. Stack args are: