use vars wasn't use utf8 aware.

p4raw-id: //depot/perl@15915

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/vars.pm b/lib/vars.pm
index a051ba128a..f6125fb2fe 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -20,8 +20,11 @@ sub import {
 		Carp::croak("Can't declare individual elements of hash or array");
 	    } elsif (warnings::enabled() and length($sym) == 1 and $sym !~ tr/a-zA-Z//) {
 		warnings::warn("No need to declare built-in vars");
-            } elsif  ( $^H &= strict::bits('vars') ) {
-              Carp::croak("'$_' is not a valid variable name under strict vars");
+            } elsif  ( $^H &= strict::bits('vars') &&
+		       # Either no 'use utf8' or if utf8, no non-word
+		       ($^H & $utf8::hint_bits == 0 ||
+			$sym =~ /\W/) ) {
+		  Carp::croak("'$_' is not a valid variable name under strict vars");
 	    }
 	}
 	$sym = "${callpack}::$sym" unless $sym =~ /::/;