pp_multiconcat: use the new AMGf_force_scalar

tonycoz · tonycoz · commit 13ed11efc373 · 2025-12-03T14:51:57.000+11:00
instead of a special case in amagic_call()
diff --git a/gv.c b/gv.c
@@ -4154,8 +4154,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags)
                  * with the context of individual concats being scalar,
                  * regardless of the overall context of the multiconcat op
                  */
-    U8 gimme = (force_scalar || (flags & AMGf_force_scalar)
-                || !PL_op || PL_op->op_type == OP_MULTICONCAT)
+    U8 gimme = (force_scalar || (flags & AMGf_force_scalar) || !PL_op )
                     ? G_SCALAR : GIMME_V;
 
     CATCH_SET(TRUE);
diff --git a/pp_hot.c b/pp_hot.c
@@ -1377,7 +1377,8 @@ PP(pp_multiconcat)
                     )
                 {
                     SV * const tmpsv = amagic_call(left, right, concat_amg,
-                                                (nextappend ? AMGf_assign: 0));
+                                                (nextappend ? AMGf_assign: 0)
+                                                   | AMGf_force_scalar);
                     if (tmpsv) {
                         /* NB: tryAMAGICbin_MG() includes an OPpTARGET_MY test
                          * here, which isn't needed as any implicit

Original file line number	Diff line number	Diff line change
`@@ -1377,7 +1377,8 @@ PP(pp_multiconcat)`
`1377`	`1377`	`)`
`1378`	`1378`	`{`
`1379`	`1379`	`SV * const tmpsv = amagic_call(left, right, concat_amg,`
`1380`		`- (nextappend ? AMGf_assign: 0));`
	`1380`	`+ (nextappend ? AMGf_assign: 0)`
	`1381`	`+ \| AMGf_force_scalar);`
`1381`	`1382`	`if (tmpsv) {`
`1382`	`1383`	`/* NB: tryAMAGICbin_MG() includes an OPpTARGET_MY test`
`1383`	`1384`	`* here, which isn't needed as any implicit`