This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Perl_sv_vcatpvfn_flags: eliminate VECTORIZE_ARGS
authorDavid Mitchell <davem@iabyn.com>
Fri, 26 May 2017 22:49:58 +0000 (23:49 +0100)
committerDavid Mitchell <davem@iabyn.com>
Wed, 7 Jun 2017 08:11:05 +0000 (09:11 +0100)
This macro is only used once. Just expand it.

sv.c

diff --git a/sv.c b/sv.c
index 2c98543..4e86988 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -11036,10 +11036,6 @@ S_F0convert(NV nv, char *const endbuf, STRLEN *const len)
 }
 
 
-#define VECTORIZE_ARGS vecsv = va_arg(*args, SV*);\
-                       vecstr = (U8*)SvPV_const(vecsv,veclen);\
-                       vec_utf8 = DO_UTF8(vecsv);
-
 /* XXX maybe_tainted is never assigned to, so the doc above is lying. */
 
 void
@@ -12107,7 +12103,9 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p
 
        if (vectorize) {
            if (args) {
-               VECTORIZE_ARGS
+                vecsv = va_arg(*args, SV*);
+                vecstr = (U8*)SvPV_const(vecsv,veclen);
+                vec_utf8 = DO_UTF8(vecsv);
            }
            else if (efix ? (efix > 0 && efix <= svmax) : svix < svmax) {
                vecsv = svargs[efix ? efix-1 : svix++];