Merge branch 'Perl:blead' into perlop_xor

Author: khwilliamson

Configure

@@ -16755,6 +16755,11 @@ define:define:?*)
 	;;
 esac
 
+if test $ivsize -lt $ptrsize; then
+    echo "Re-run Configure adding -Duse64bitint so as to make integers as large as pointer values" >&4
+    exit 1
+fi
+
 case "$uselongdouble:$d_longdbl" in
 define:define)
 	nvtype="long double"

Porting/Maintainers.pl

@@ -528,7 +528,7 @@ package Maintainers;
     },
 
     'ExtUtils::ParseXS' => {
-        'DISTRIBUTION' => 'LEONT/ExtUtils-ParseXS-3.51.tar.gz',
+        'DISTRIBUTION' => 'LEONT/ExtUtils-ParseXS-3.57.tar.gz',
         'FILES'        => q[dist/ExtUtils-ParseXS],
     },
 

lib/B/Deparse.pm

@@ -7,7 +7,7 @@
 # This is based on the module of the same name by Malcolm Beattie,
 # but essentially none of his code remains.
 
-package B::Deparse 1.84;
+package B::Deparse 1.85;
 use strict;
 use Carp;
 use B qw(class main_root main_start main_cv svref_2object opnumber perlstring
@@ -3318,9 +3318,16 @@ sub pp_and { logop(@_, "and", 3, "&&", 11, "if") }
 sub pp_or  { logop(@_, "or",  2, "||", 10, "unless") }
 sub pp_dor { logop(@_, "//", 10) }
 
-# xor is syntactically a logop, but it's really a binop (contrary to
-# old versions of opcode.pl). Syntax is what matters here.
-sub pp_xor { logop(@_, "xor", 2, "^^", 10, "") }
+sub pp_xor {
+    my $self = shift;
+    my ($op, $cx) = @_;
+    if ($cx > 2 or $op->flags & OPf_STACKED) {
+        binop($self, @_, "^^", 10, ASSIGN);
+    }
+    else {
+        binop($self, @_, "xor", 2);
+    }
+}
 
 sub logassignop {
     my $self = shift;

lib/B/Deparse.t

@@ -3450,3 +3450,8 @@ $_ = (!$p) isa 'Some::Class';
 $_ = (!$p) =~ tr/1//;
 $_ = (!$p) =~ /1/;
 $_ = (!$p) =~ s/1//r;
+####
+# xor operator
+my($x, $y, $z);
+$z = 1 + ($x ^^ $y);
+$z = ($x ^^= $y);

lib/Thread.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-our $VERSION = '3.05';
+our $VERSION = '3.06';
 $VERSION = eval $VERSION;
 
 BEGIN {
@@ -61,7 +61,7 @@ In Perl 5.005, the thread model was that all data is implicitly shared, and
 shared access to data has to be explicitly synchronized.  This model is called
 I<5005threads>.
 
-In Perl 5.6, a new model was introduced in which all is was thread local and
+In Perl 5.6, a new model was introduced in which all data is thread local and
 shared access to data has to be explicitly declared.  This model is called
 I<ithreads>, for "interpreter threads".
 

lib/builtin.pm

@@ -1,4 +1,4 @@
-package builtin 0.018;
+package builtin 0.019;
 
 use v5.40;
 
@@ -43,6 +43,10 @@ can be requested for convenience.
 Individual named functions can be imported by listing them as import
 parameters on the C<use> statement for this pragma.
 
+The L<builtin::compat> module from CPAN provides versions of many of these
+functions that can be used on Perl versions where C<builtin> or specific
+functions are not yet available.
+
 B<Warning>:  At present, many of the functions in the C<builtin> namespace are
 experimental.  Calling them will trigger warnings of the
 C<experimental::builtin> category.
@@ -414,15 +418,12 @@ A complete list is in L<perlrecharclass/Whitespace>.
 
 C<trim> is equivalent to:
 
-    $str =~ s/\A\s+|\s+\z//urg;
+    my $trimmed = $str =~ s/\A\s+//ur =~ s/\s+\z//ur;
 
 Available starting with Perl 5.36. Since Perl 5.40, it is no longer
 experimental and it is included in the 5.40 and higher builtin version
 bundles.
 
-For Perl versions where this function is not available look at the
-L<String::Util> module for a comparable implementation.
-
 =head2 is_tainted
 
     $bool = is_tainted($var);
@@ -487,4 +488,4 @@ Available starting with Perl 5.40.
 
 =head1 SEE ALSO
 
-L<perlop>, L<perlfunc>, L<Scalar::Util>
+L<perlop>, L<perlfunc>, L<Scalar::Util>, L<builtin::compat>

lib/strict.pm

@@ -1,6 +1,6 @@
 package strict;
 
-$strict::VERSION = "1.13";
+$strict::VERSION = "1.14";
 
 my ( %bitmask, %explicit_bitmask );
 
@@ -12,12 +12,15 @@ BEGIN {
         if __FILE__ !~ ( '(?x) \b     '.__PACKAGE__.'  \.pmc? \z' )
         && __FILE__ =~ ( '(?x) \b (?i:'.__PACKAGE__.') \.pmc? \z' );
 
+    # which strictures are actually in force
     %bitmask = (
         refs => 0x00000002,
         subs => 0x00000200,
         vars => 0x00000400,
     );
 
+    # which strictures have at some point been turned on or off explicitly
+    # and must therefore not be touched by any subsequent `use VERSION` or `no VERSION`
     %explicit_bitmask = (
         refs => 0x00000020,
         subs => 0x00000040,
@@ -38,12 +41,12 @@ BEGIN {
 }
 
 sub bits {
+    my $do_explicit = caller eq __PACKAGE__;
     my $bits = 0;
     my @wrong;
     foreach my $s (@_) {
         if (exists $bitmask{$s}) {
-            $^H |= $explicit_bitmask{$s};
-
+            $bits |= $explicit_bitmask{$s} if $do_explicit;
             $bits |= $bitmask{$s};
         }
         else {
@@ -66,7 +69,9 @@ sub unimport {
     shift;
 
     if (@_) {
-        $^H &= ~&bits;
+        my $bits = &bits;
+        $^H &= ~$bits;
+        $^H |= all_explicit_bits & $bits;
     }
     else {
         $^H &= ~all_bits;
@@ -75,6 +80,7 @@ sub unimport {
 }
 
 1;
+
 __END__
 
 =head1 NAME

metaconfig.h

@@ -61,6 +61,7 @@
  * HAS_OPENAT
  * HAS_PRCTL
  * HAS_PSEUDOFORK
+ * HAS_PTRDIFF_T
  * HAS_RANDOM_R
  * HAS_SIGINFO_SI_VALUE
  * HAS_SIGSETJMP

op.c

@@ -3230,6 +3230,7 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags)
     case OP_I_MODULO:
     case OP_I_ADD:
     case OP_I_SUBTRACT:
+    case OP_XOR:
         if (!(o->op_flags & OPf_STACKED))
             goto nomod;
         PL_modcount++;

pod/perldebguts.pod

@@ -34,6 +34,12 @@ Perl inserts the contents of C<$ENV{PERL5DB}> (or C<BEGIN {require
 
 =item *
 
+If the C<-dt> switch is supplied, C<PERL5DB_THREADED=1> is set in the
+environment.  C<perl5db.pl> or your custom debugger can use this to
+enable threading support.
+
+=item *
+
 Each array C<@{"_<$filename"}> holds the lines of $filename for a
 file compiled by Perl.  The same is also true for C<eval>ed strings
 that contain subroutines, or which are currently being executed.