diff options
| -rw-r--r-- | ext/threads/t/problems.t | 22 | ||||
| -rw-r--r-- | lib/warnings.pm | 6 | ||||
| -rw-r--r-- | sv.c | 2 | ||||
| -rw-r--r-- | warnings.pl | 6 |
4 files changed, 28 insertions, 8 deletions
diff --git a/ext/threads/t/problems.t b/ext/threads/t/problems.t index b860ff5e1d..b2b78dfe40 100644 --- a/ext/threads/t/problems.t +++ b/ext/threads/t/problems.t @@ -18,7 +18,7 @@ use threads::shared; # call is() from within the DESTROY() function at global destruction time, # and parts of Test::* may have already been freed by then -print "1..5\n"; +print "1..8\n"; my $test : shared = 1; @@ -73,4 +73,24 @@ my $not = eval { Config::myconfig() } ? '' : 'not '; print "${not}ok $test - Are we able to call Config::myconfig after clone\n"; $test++; +# bugid 24383 - :unique hashes weren't being made readonly on interpreter +# clone; check that they are. + +our $unique_scalar : unique; +our @unique_array : unique; +our %unique_hash : unique; +threads->new( + sub { + eval { $unique_scalar = 1 }; + print $@ =~ /read-only/ ? '' : 'not ', "ok $test - unique_scalar\n"; + $test++; + eval { $unique_array[0] = 1 }; + print $@ =~ /read-only/ ? '' : 'not ', "ok $test - unique_array\n"; + $test++; + eval { $unique_hash{abc} = 1 }; + print $@ =~ /disallowed/ ? '' : 'not ', "ok $test - unique_hash\n"; + $test++; + } +)->join; + 1; diff --git a/lib/warnings.pm b/lib/warnings.pm index 9e9b3b55ca..656b7ac491 100644 --- a/lib/warnings.pm +++ b/lib/warnings.pm @@ -133,7 +133,7 @@ See L<perlmodlib/Pragmatic Modules> and L<perllexwarn>. use Carp (); -our %Offsets : unique = ( +our %Offsets = ( # Warnings Categories added in Perl 5.008 @@ -190,7 +190,7 @@ our %Offsets : unique = ( 'assertions' => 94, ); -our %Bits : unique = ( +our %Bits = ( 'all' => "\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55", # [0..47] 'ambiguous' => "\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00", # [29] 'assertions' => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40", # [47] @@ -241,7 +241,7 @@ our %Bits : unique = ( 'y2k' => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10", # [46] ); -our %DeadBits : unique = ( +our %DeadBits = ( 'all' => "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", # [0..47] 'ambiguous' => "\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00", # [29] 'assertions' => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80", # [47] @@ -10030,7 +10030,7 @@ S_gv_share(pTHX_ SV *sstr, CLONE_PARAMS *param) GvHV(gv) = (HV*)sv; } else { - SvREADONLY_on(GvAV(gv)); + SvREADONLY_on(GvHV(gv)); } return sstr; /* he_dup() will SvREFCNT_inc() */ diff --git a/warnings.pl b/warnings.pl index 7feccb5751..df766fea3d 100644 --- a/warnings.pl +++ b/warnings.pl @@ -414,7 +414,7 @@ while (<DATA>) { #$list{'all'} = [ $offset .. 8 * ($warn_size/2) - 1 ] ; $last_ver = 0; -print PM "our %Offsets : unique = (\n" ; +print PM "our %Offsets = (\n" ; foreach my $k (sort { $a <=> $b } keys %ValueToName) { my ($name, $version) = @{ $ValueToName{$k} }; $name = lc $name; @@ -430,7 +430,7 @@ foreach my $k (sort { $a <=> $b } keys %ValueToName) { print PM " );\n\n" ; -print PM "our %Bits : unique = (\n" ; +print PM "our %Bits = (\n" ; foreach $k (sort keys %list) { my $v = $list{$k} ; @@ -444,7 +444,7 @@ foreach $k (sort keys %list) { print PM " );\n\n" ; -print PM "our %DeadBits : unique = (\n" ; +print PM "our %DeadBits = (\n" ; foreach $k (sort keys %list) { my $v = $list{$k} ; |