"Use of uninitialized value..." UTF8 cleanup

diff --git a/perl.h b/perl.h
index a6679b6..200fd82 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -4215,6 +4215,8 @@ START_EXTERN_C
 /* handy constants */
 EXTCONST char PL_warn_uninit[]
   INIT("Use of uninitialized value%s%s%s");
 /* handy constants */
 EXTCONST char PL_warn_uninit[]
   INIT("Use of uninitialized value%s%s%s");

+EXTCONST char PL_warn_uninit_sv[]
+  INIT("Use of uninitialized value%"SVf"%s%s");

 EXTCONST char PL_warn_nosemi[]
   INIT("Semicolon seems to be missing");
 EXTCONST char PL_warn_reserved[]
 EXTCONST char PL_warn_nosemi[]
   INIT("Semicolon seems to be missing");
 EXTCONST char PL_warn_reserved[]

diff --git a/sv.c b/sv.c
index 069ef06..7cbf26c 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -14317,8 +14317,8 @@ Perl_report_uninit(pTHX_ const SV *uninit_sv)
            if (varname)
                sv_insert(varname, 0, 0, " ", 1);
        }
            if (varname)
                sv_insert(varname, 0, 0, " ", 1);
        }

-       Perl_warner(aTHX_ packWARN(WARN_UNINITIALIZED), PL_warn_uninit,
-               varname ? SvPV_nolen_const(varname) : "",
+       Perl_warner(aTHX_ packWARN(WARN_UNINITIALIZED), PL_warn_uninit_sv,
+               SVfARG(varname ? varname : &PL_sv_no),

                " in ", OP_DESC(PL_op));
     }
     else
                " in ", OP_DESC(PL_op));
     }
     else

diff --git a/t/lib/warnings/9uninit b/t/lib/warnings/9uninit
index f13b461..69be056 100644 (file)
--- a/t/lib/warnings/9uninit
+++ b/t/lib/warnings/9uninit
@@ -33,6 +33,19 @@ Use of uninitialized value $m2 in addition (+) at - line 6.
 Use of uninitialized value $m1 in addition (+) at - line 6.
 ########
 use warnings 'uninitialized';
 Use of uninitialized value $m1 in addition (+) at - line 6.
 ########
 use warnings 'uninitialized';

+use utf8;
+use open qw( :utf8 :std );
+
+$v = $à1 + 10;
+$v = 22 + $ａ2;
+$v = $à1 + $ａ2;
+EXPECT
+Use of uninitialized value $à1 in addition (+) at - line 5.
+Use of uninitialized value $ａ2 in addition (+) at - line 6.
+Use of uninitialized value $ａ2 in addition (+) at - line 7.
+Use of uninitialized value $à1 in addition (+) at - line 7.
+########
+use warnings 'uninitialized';

 my ($m1, $v);
 our ($g1, $g2);
 
 my ($m1, $v);
 our ($g1, $g2);