merge branch zefram/dumb_match

diff --cc MANIFEST
Simple merge

diff --cc Porting/Maintainers.pl
index 19f17fa,ee616af..b662ea8
--- 1/Porting/Maintainers.pl
--- 2/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@@ -407,12 -413,13 +414,17 @@@ use File::Glob qw(:case)
      },
  
      'experimental' => {
 -        'DISTRIBUTION' => 'LEONT/experimental-0.017.tar.gz',
 +        'DISTRIBUTION' => 'LEONT/experimental-0.019.tar.gz',
          'FILES'        => q[cpan/experimental],
 +        'EXCLUDED'     => [
 +            qr{^xt/},
 +            qr{nytprof.*}
 +        ],
+         'EXCLUDED'     => [qr{^xt/}],
+         'CUSTOMIZED'   => [
+           # smartmatch changes
+           't/basic.t',
+         ],
      },
  
      'Exporter' => {

diff --cc cpan/experimental/t/basic.t
index 5be845b,a36943a..b54bd11
--- 1/cpan/experimental/t/basic.t
--- 2/cpan/experimental/t/basic.t
+++ b/cpan/experimental/t/basic.t
@@@ -35,8 -33,8 +33,8 @@@ EN
  if ($] >= 5.010001) {
        is (eval <<'END', 1, 'smartmatch compiles') or diag $@;
        use experimental 'smartmatch';
-       sub baz { 1 };
-       is(1 ~~ \&baz, 1, "is 1");
 -      { package Bar; use overload "~~" => sub { 1 }; }
 -      is(1 ~~ bless({}, "Bar"), 1, "is 1");
++      { package Baz; use overload "~~" => sub { 1 }; }
++      is(1 ~~ bless({}, "Baz"), 1, "is 1");
        1;
  END
  }

diff --cc embed.fnc
Simple merge

diff --cc embed.h
Simple merge

diff --cc gv.c
Simple merge

diff --cc inline.h
Simple merge

diff --cc lib/B/Deparse-core.t
Simple merge

diff --cc lib/B/Deparse.pm
Simple merge

diff --cc lib/B/Deparse.t
Simple merge

diff --cc lib/B/Op_private.pm
Simple merge

diff --cc lib/overload.t
index 2afa6cf,077a796..99f5b64
--- 1/lib/overload.t
--- 2/lib/overload.t
+++ b/lib/overload.t
@@@ -48,7 -48,7 +48,7 @@@ package main
  
  $| = 1;
  BEGIN { require './test.pl'; require './charset_tools.pl' }
- plan tests => 5338;
 -plan tests => 5385;
++plan tests => 5392;
  
  use Scalar::Util qw(tainted);
  

diff --cc op.c
Simple merge

diff --cc opcode.h
index 2556a01,9178152..ae54c3a
--- 1/opcode.h
--- 2/opcode.h
+++ b/opcode.h
@@@ -2442,14 -2428,14 +2430,14 @@@ EXTCONST char PL_op_private_labels[] = 
  EXTCONST I16 PL_op_private_bitfields[] = {
      0, 8, -1,
      0, 8, -1,
-     0, 583, -1,
 -    0, 572, -1,
++    0, 579, -1,
      0, 8, -1,
      0, 8, -1,
-     0, 590, -1,
--    0, 579, -1,
-     1, -1, 0, 547, 1, 40, 2, 290, -1,
-     4, -1, 1, 171, 2, 178, 3, 185, -1,
-     4, -1, 0, 547, 1, 40, 2, 290, 3, 117, -1,
 -    0, 568, -1,
 -    1, -1, 0, 536, 1, 40, 2, 286, -1,
++    0, 586, -1,
++    0, 575, -1,
++    1, -1, 0, 543, 1, 40, 2, 286, -1,
+     4, -1, 1, 167, 2, 174, 3, 181, -1,
 -    4, -1, 0, 536, 1, 40, 2, 286, 3, 117, -1,
++    4, -1, 0, 543, 1, 40, 2, 286, 3, 117, -1,
  
  };
  
@@@ -2653,35 -2639,33 +2641,33 @@@ EXTCONST I16  PL_op_private_bitdef_ix[
        52, /* die */
        52, /* reset */
        -1, /* lineseq */
 -     177, /* nextstate */
 -     177, /* dbstate */
 +     180, /* nextstate */
 +     180, /* dbstate */
        -1, /* unstack */
        -1, /* enter */
 -     178, /* leave */
 +     181, /* leave */
        -1, /* scope */
 -     180, /* enteriter */
 -     183, /* iter */
 +     183, /* enteriter */
-      187, /* iter */
++     186, /* iter */
        -1, /* enterloop */
-      188, /* leaveloop */
 -     184, /* leaveloop */
++     187, /* leaveloop */
        -1, /* return */
-      190, /* last */
-      190, /* next */
-      190, /* redo */
-      190, /* dump */
-      190, /* goto */
 -     186, /* last */
 -     186, /* next */
 -     186, /* redo */
 -     186, /* dump */
 -     186, /* goto */
++     189, /* last */
++     189, /* next */
++     189, /* redo */
++     189, /* dump */
++     189, /* goto */
        52, /* exit */
         0, /* method */
         0, /* method_named */
         0, /* method_super */
         0, /* method_redir */
         0, /* method_redir_super */
-        0, /* entergiven */
-        0, /* leavegiven */
-        0, /* enterwhen */
-        0, /* leavewhen */
-       -1, /* break */
+       -1, /* entergiven */
+        0, /* enterwhereso */
+        0, /* leavewhereso */
        -1, /* continue */
-      192, /* open */
 -     188, /* open */
++     191, /* open */
        52, /* close */
        52, /* pipe_op */
        52, /* fileno */
@@@ -2727,44 -2711,44 +2713,44 @@@
         0, /* getpeername */
         0, /* lstat */
         0, /* stat */
-      197, /* ftrread */
-      197, /* ftrwrite */
-      197, /* ftrexec */
-      197, /* fteread */
-      197, /* ftewrite */
-      197, /* fteexec */
-      202, /* ftis */
-      202, /* ftsize */
-      202, /* ftmtime */
-      202, /* ftatime */
-      202, /* ftctime */
-      202, /* ftrowned */
-      202, /* fteowned */
-      202, /* ftzero */
-      202, /* ftsock */
-      202, /* ftchr */
-      202, /* ftblk */
-      202, /* ftfile */
-      202, /* ftdir */
-      202, /* ftpipe */
-      202, /* ftsuid */
-      202, /* ftsgid */
-      202, /* ftsvtx */
-      202, /* ftlink */
-      202, /* fttty */
-      202, /* fttext */
-      202, /* ftbinary */
 -     193, /* ftrread */
 -     193, /* ftrwrite */
 -     193, /* ftrexec */
 -     193, /* fteread */
 -     193, /* ftewrite */
 -     193, /* fteexec */
 -     198, /* ftis */
 -     198, /* ftsize */
 -     198, /* ftmtime */
 -     198, /* ftatime */
 -     198, /* ftctime */
 -     198, /* ftrowned */
 -     198, /* fteowned */
 -     198, /* ftzero */
 -     198, /* ftsock */
 -     198, /* ftchr */
 -     198, /* ftblk */
 -     198, /* ftfile */
 -     198, /* ftdir */
 -     198, /* ftpipe */
 -     198, /* ftsuid */
 -     198, /* ftsgid */
 -     198, /* ftsvtx */
 -     198, /* ftlink */
 -     198, /* fttty */
 -     198, /* fttext */
 -     198, /* ftbinary */
 -      90, /* chdir */
 -      90, /* chown */
++     196, /* ftrread */
++     196, /* ftrwrite */
++     196, /* ftrexec */
++     196, /* fteread */
++     196, /* ftewrite */
++     196, /* fteexec */
++     201, /* ftis */
++     201, /* ftsize */
++     201, /* ftmtime */
++     201, /* ftatime */
++     201, /* ftctime */
++     201, /* ftrowned */
++     201, /* fteowned */
++     201, /* ftzero */
++     201, /* ftsock */
++     201, /* ftchr */
++     201, /* ftblk */
++     201, /* ftfile */
++     201, /* ftdir */
++     201, /* ftpipe */
++     201, /* ftsuid */
++     201, /* ftsgid */
++     201, /* ftsvtx */
++     201, /* ftlink */
++     201, /* fttty */
++     201, /* fttext */
++     201, /* ftbinary */
 +      93, /* chdir */
 +      93, /* chown */
        75, /* chroot */
 -      90, /* unlink */
 -      90, /* chmod */
 -      90, /* utime */
 -      90, /* rename */
 -      90, /* link */
 -      90, /* symlink */
 +      93, /* unlink */
 +      93, /* chmod */
 +      93, /* utime */
 +      93, /* rename */
 +      93, /* link */
 +      93, /* symlink */
         0, /* readlink */
 -      90, /* mkdir */
 +      93, /* mkdir */
        75, /* rmdir */
        52, /* open_dir */
         0, /* readdir */
@@@ -2773,17 -2757,17 +2759,17 @@@
         0, /* rewinddir */
         0, /* closedir */
        -1, /* fork */
-      206, /* wait */
 -     202, /* wait */
 -      90, /* waitpid */
 -      90, /* system */
 -      90, /* exec */
 -      90, /* kill */
 -     202, /* getppid */
 -      90, /* getpgrp */
 -      90, /* setpgrp */
 -      90, /* getpriority */
 -      90, /* setpriority */
 -     202, /* time */
++     205, /* wait */
 +      93, /* waitpid */
 +      93, /* system */
 +      93, /* exec */
 +      93, /* kill */
-      206, /* getppid */
++     205, /* getppid */
 +      93, /* getpgrp */
 +      93, /* setpgrp */
 +      93, /* getpriority */
 +      93, /* setpriority */
-      206, /* time */
++     205, /* time */
        -1, /* tms */
         0, /* localtime */
        52, /* gmtime */
@@@ -2803,8 -2787,8 +2789,8 @@@
         0, /* require */
         0, /* dofile */
        -1, /* hintseval */
-      207, /* entereval */
 -     203, /* entereval */
 -     171, /* leaveeval */
++     206, /* entereval */
 +     174, /* leaveeval */
         0, /* entertry */
        -1, /* leavetry */
         0, /* ghbyname */
@@@ -2842,18 -2826,18 +2828,18 @@@
         0, /* lock */
         0, /* once */
        -1, /* custom */
-      213, /* coreargs */
-      217, /* avhvswitch */
 -     209, /* coreargs */
 -     213, /* avhvswitch */
++     212, /* coreargs */
++     216, /* avhvswitch */
         3, /* runcv */
         0, /* fc */
        -1, /* padcv */
        -1, /* introcv */
        -1, /* clonecv */
-      219, /* padrange */
-      221, /* refassign */
-      227, /* lvref */
-      233, /* lvrefslice */
-      234, /* lvavref */
 -     215, /* padrange */
 -     217, /* refassign */
 -     223, /* lvref */
 -     229, /* lvrefslice */
 -     230, /* lvavref */
++     218, /* padrange */
++     220, /* refassign */
++     226, /* lvref */
++     232, /* lvrefslice */
++     233, /* lvavref */
         0, /* anonconst */
  
  };
@@@ -2873,76 -2857,75 +2859,76 @@@
   */
  
  EXTCONST U16  PL_op_private_bitdefs[] = {
-     0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, argcheck, argdefelem, method, method_named, method_super, method_redir, method_redir_super, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst */
-     0x2f3c, 0x4119, /* pushmark */
+     0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, argcheck, argdefelem, method, method_named, method_super, method_redir, method_redir_super, enterwhereso, leavewhereso, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst */
 -    0x2ebc, 0x3fb9, /* pushmark */
++    0x2ebc, 0x4099, /* pushmark */
      0x00bd, /* wantarray, runcv */
-     0x0578, 0x19b0, 0x41cc, 0x3c88, 0x3465, /* const */
-     0x2f3c, 0x35b9, /* gvsv */
-     0x1815, /* gv */
 -    0x0578, 0x1930, 0x406c, 0x3b28, 0x3305, /* const */
 -    0x2ebc, 0x3459, /* gvsv */
++    0x0578, 0x1930, 0x414c, 0x3c08, 0x33e5, /* const */
++    0x2ebc, 0x3539, /* gvsv */
+     0x1795, /* gv */
      0x0067, /* gelem, lt, i_lt, gt, i_gt, le, i_le, ge, i_ge, eq, i_eq, ne, i_ne, ncmp, i_ncmp, slt, sgt, sle, sge, seq, sne, scmp, bit_and, bit_xor, bit_or, sbit_and, sbit_xor, sbit_or, smartmatch, lslice, xor */
-     0x2f3c, 0x4118, 0x03d7, /* padsv */
-     0x2f3c, 0x4118, 0x06f4, 0x302c, 0x3e09, /* padav */
-     0x2f3c, 0x4118, 0x06f4, 0x0790, 0x302c, 0x3e08, 0x2aa1, /* padhv */
-     0x2f3c, 0x1b98, 0x03d6, 0x302c, 0x3388, 0x41c4, 0x0003, /* rv2gv */
-     0x2f3c, 0x35b8, 0x03d6, 0x41c4, 0x0003, /* rv2sv */
-     0x302c, 0x0003, /* av2arylen, akeys, values, keys */
-     0x32fc, 0x0fd8, 0x0d34, 0x028c, 0x44c8, 0x41c4, 0x0003, /* rv2cv */
 -    0x2ebc, 0x3fb8, 0x03d7, /* padsv */
 -    0x2ebc, 0x3fb8, 0x06f4, 0x2fac, 0x3ca9, /* padav */
 -    0x2ebc, 0x3fb8, 0x06f4, 0x0790, 0x2fac, 0x3ca8, 0x2a21, /* padhv */
 -    0x2ebc, 0x1b18, 0x03d6, 0x2fac, 0x3228, 0x4064, 0x0003, /* rv2gv */
 -    0x2ebc, 0x3458, 0x03d6, 0x4064, 0x0003, /* rv2sv */
++    0x2ebc, 0x4098, 0x03d7, /* padsv */
++    0x2ebc, 0x4098, 0x06f4, 0x2fac, 0x3d89, /* padav */
++    0x2ebc, 0x4098, 0x06f4, 0x0790, 0x2fac, 0x3d88, 0x2a21, /* padhv */
++    0x2ebc, 0x1b18, 0x03d6, 0x2fac, 0x3308, 0x4144, 0x0003, /* rv2gv */
++    0x2ebc, 0x3538, 0x03d6, 0x4144, 0x0003, /* rv2sv */
+     0x2fac, 0x0003, /* av2arylen, akeys, values, keys */
 -    0x319c, 0x0fd8, 0x0d34, 0x028c, 0x4368, 0x4064, 0x0003, /* rv2cv */
++    0x327c, 0x0fd8, 0x0d34, 0x028c, 0x4448, 0x4144, 0x0003, /* rv2cv */
      0x06f4, 0x0790, 0x0003, /* ref */
      0x018f, /* bless, glob, sprintf, formline, unpack, pack, join, anonlist, anonhash, splice, warn, die, reset, exit, close, pipe_op, fileno, umask, binmode, tie, dbmopen, sselect, select, getc, read, enterwrite, sysopen, sysseek, sysread, syswrite, eof, tell, seek, truncate, fcntl, ioctl, send, recv, socket, sockpair, bind, connect, listen, accept, shutdown, gsockopt, ssockopt, open_dir, seekdir, gmtime, shmget, shmctl, shmread, shmwrite, msgget, msgctl, msgsnd, msgrcv, semop, semget, semctl, ghbyaddr, gnbyaddr, gpbynumber, gsbyname, gsbyport, syscall */
-     0x379c, 0x36b8, 0x27f4, 0x2730, 0x0003, /* backtick */
 -    0x363c, 0x3558, 0x2774, 0x26b0, 0x0003, /* backtick */
++    0x371c, 0x3638, 0x2774, 0x26b0, 0x0003, /* backtick */
      0x06f5, /* subst */
-     0x10dc, 0x2118, 0x0914, 0x3f4c, 0x24a8, 0x01e4, 0x0141, /* trans, transr */
 -    0x105c, 0x2098, 0x0914, 0x3dec, 0x2428, 0x01e4, 0x0141, /* trans, transr */
++    0x105c, 0x2098, 0x0914, 0x3ecc, 0x2428, 0x01e4, 0x0141, /* trans, transr */
      0x0f1c, 0x0618, 0x0067, /* sassign */
-     0x0bd8, 0x0ad4, 0x09d0, 0x302c, 0x06e8, 0x0067, /* aassign */
-     0x4570, 0x0003, /* chomp, schomp, ncomplement, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, ord, chr, chroot, rmdir */
-     0x06f4, 0x302c, 0x0003, /* pos */
-     0x4570, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract, left_shift, right_shift, nbit_and, nbit_xor, nbit_or */
-     0x1498, 0x0067, /* repeat */
-     0x3218, 0x4570, 0x0067, /* concat */
-     0x2f3c, 0x0358, 0x1b94, 0x4570, 0x42ac, 0x0003, /* multiconcat */
-     0x4570, 0x018f, /* stringify, atan2, rand, srand, crypt, push, unshift, flock, chdir, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */
-     0x06f4, 0x4570, 0x0003, /* length */
-     0x39f0, 0x302c, 0x012b, /* substr */
-     0x302c, 0x0067, /* vec */
-     0x3198, 0x06f4, 0x4570, 0x018f, /* index, rindex */
-     0x2f3c, 0x35b8, 0x06f4, 0x302c, 0x3e08, 0x41c4, 0x0003, /* rv2av */
+     0x0bd8, 0x0ad4, 0x09d0, 0x2fac, 0x06e8, 0x0067, /* aassign */
 -    0x4410, 0x0003, /* chomp, schomp, ncomplement, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, ord, chr, chroot, rmdir */
++    0x44f0, 0x0003, /* chomp, schomp, ncomplement, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, ord, chr, chroot, rmdir */
+     0x06f4, 0x2fac, 0x0003, /* pos */
 -    0x4410, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract, concat, left_shift, right_shift, nbit_and, nbit_xor, nbit_or */
++    0x44f0, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract, left_shift, right_shift, nbit_and, nbit_xor, nbit_or */
+     0x1418, 0x0067, /* repeat */
 -    0x2ebc, 0x0358, 0x1b14, 0x4410, 0x414c, 0x0003, /* multiconcat */
 -    0x4410, 0x018f, /* stringify, atan2, rand, srand, crypt, push, unshift, flock, chdir, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */
 -    0x06f4, 0x4410, 0x0003, /* length */
 -    0x3890, 0x2fac, 0x012b, /* substr */
++    0x3198, 0x44f0, 0x0067, /* concat */
++    0x2ebc, 0x0358, 0x1b14, 0x44f0, 0x422c, 0x0003, /* multiconcat */
++    0x44f0, 0x018f, /* stringify, atan2, rand, srand, crypt, push, unshift, flock, chdir, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */
++    0x06f4, 0x44f0, 0x0003, /* length */
++    0x3970, 0x2fac, 0x012b, /* substr */
+     0x2fac, 0x0067, /* vec */
 -    0x3118, 0x06f4, 0x4410, 0x018f, /* index, rindex */
 -    0x2ebc, 0x3458, 0x06f4, 0x2fac, 0x3ca8, 0x4064, 0x0003, /* rv2av */
++    0x3118, 0x06f4, 0x44f0, 0x018f, /* index, rindex */
++    0x2ebc, 0x3538, 0x06f4, 0x2fac, 0x3d88, 0x4144, 0x0003, /* rv2av */
      0x025f, /* aelemfast, aelemfast_lex */
-     0x2f3c, 0x2e38, 0x03d6, 0x302c, 0x0067, /* aelem, helem */
-     0x2f3c, 0x302c, 0x3e09, /* aslice, hslice */
-     0x302d, /* kvaslice, kvhslice */
-     0x2f3c, 0x3d58, 0x2b54, 0x0003, /* delete */
-     0x43f8, 0x0003, /* exists */
-     0x2f3c, 0x35b8, 0x06f4, 0x0790, 0x302c, 0x3e08, 0x41c4, 0x2aa1, /* rv2hv */
-     0x2f3c, 0x2e38, 0x1154, 0x1ab0, 0x302c, 0x41c4, 0x0003, /* multideref */
-     0x2f3c, 0x35b8, 0x0430, 0x2c4c, 0x2569, /* split */
-     0x2f3c, 0x21d9, /* list */
-     0x46dc, 0x4038, 0x13f0, 0x288c, 0x3ae8, 0x2984, 0x3521, /* sort */
-     0x288c, 0x0003, /* reverse */
+     0x2ebc, 0x2db8, 0x03d6, 0x2fac, 0x0067, /* aelem, helem */
 -    0x2ebc, 0x2fac, 0x3ca9, /* aslice, hslice */
++    0x2ebc, 0x2fac, 0x3d89, /* aslice, hslice */
+     0x2fad, /* kvaslice, kvhslice */
 -    0x2ebc, 0x3bf8, 0x2ad4, 0x0003, /* delete */
 -    0x4298, 0x0003, /* exists */
 -    0x2ebc, 0x3458, 0x06f4, 0x0790, 0x2fac, 0x3ca8, 0x4064, 0x2a21, /* rv2hv */
 -    0x2ebc, 0x2db8, 0x10d4, 0x1a30, 0x2fac, 0x4064, 0x0003, /* multideref */
 -    0x2ebc, 0x3458, 0x0430, 0x2bcc, 0x24e9, /* split */
++    0x2ebc, 0x3cd8, 0x2ad4, 0x0003, /* delete */
++    0x4378, 0x0003, /* exists */
++    0x2ebc, 0x3538, 0x06f4, 0x0790, 0x2fac, 0x3d88, 0x4144, 0x2a21, /* rv2hv */
++    0x2ebc, 0x2db8, 0x10d4, 0x1a30, 0x2fac, 0x4144, 0x0003, /* multideref */
++    0x2ebc, 0x3538, 0x0430, 0x2bcc, 0x24e9, /* split */
+     0x2ebc, 0x2159, /* list */
 -    0x457c, 0x3ed8, 0x1370, 0x280c, 0x3988, 0x2904, 0x33c1, /* sort */
++    0x465c, 0x3fb8, 0x1370, 0x280c, 0x3a68, 0x2904, 0x34a1, /* sort */
+     0x280c, 0x0003, /* reverse */
      0x06f4, 0x0003, /* grepwhile */
-     0x2cd8, 0x0003, /* flip, flop */
-     0x2f3c, 0x0003, /* cond_expr */
-     0x2f3c, 0x0fd8, 0x03d6, 0x028c, 0x44c8, 0x41c4, 0x2641, /* entersub */
-     0x3858, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */
+     0x2c58, 0x0003, /* flip, flop */
+     0x2ebc, 0x0003, /* cond_expr */
 -    0x2ebc, 0x0fd8, 0x03d6, 0x028c, 0x4368, 0x4064, 0x25c1, /* entersub */
 -    0x36f8, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */
++    0x2ebc, 0x0fd8, 0x03d6, 0x028c, 0x4448, 0x4144, 0x25c1, /* entersub */
++    0x37d8, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */
      0x02aa, 0x0003, /* argelem */
      0x00bc, 0x018f, /* caller */
-     0x23b5, /* nextstate, dbstate */
-     0x2ddc, 0x3859, /* leave */
-     0x2f3c, 0x35b8, 0x104c, 0x3b65, /* enteriter */
-     0x3b65, /* iter */
-     0x2ddc, 0x0067, /* leaveloop */
-     0x47fc, 0x0003, /* last, next, redo, dump, goto */
-     0x379c, 0x36b8, 0x27f4, 0x2730, 0x018f, /* open */
-     0x1d50, 0x1fac, 0x1e68, 0x1c24, 0x0003, /* ftrread, ftrwrite, ftrexec, fteread, ftewrite, fteexec */
-     0x1d50, 0x1fac, 0x1e68, 0x0003, /* ftis, ftsize, ftmtime, ftatime, ftctime, ftrowned, fteowned, ftzero, ftsock, ftchr, ftblk, ftfile, ftdir, ftpipe, ftsuid, ftsgid, ftsvtx, ftlink, fttty, fttext, ftbinary */
-     0x4571, /* wait, getppid, time */
-     0x38f4, 0x0df0, 0x084c, 0x4648, 0x22c4, 0x0003, /* entereval */
-     0x30fc, 0x0018, 0x1304, 0x1221, /* coreargs */
-     0x302c, 0x00c7, /* avhvswitch */
-     0x2f3c, 0x01fb, /* padrange */
-     0x2f3c, 0x4118, 0x04f6, 0x2a0c, 0x1908, 0x0067, /* refassign */
-     0x2f3c, 0x4118, 0x04f6, 0x2a0c, 0x1908, 0x0003, /* lvref */
-     0x2f3d, /* lvrefslice */
-     0x2f3c, 0x4118, 0x0003, /* lvavref */
+     0x2335, /* nextstate, dbstate */
 -    0x2d5c, 0x36f9, /* leave */
 -    0x2ebc, 0x3458, 0x3a05, /* enteriter */
 -    0x3a05, /* iter */
++    0x2d5c, 0x37d9, /* leave */
++    0x2ebc, 0x3538, 0x3ae5, /* enteriter */
++    0x3ae5, /* iter */
+     0x2d5c, 0x0067, /* leaveloop */
 -    0x469c, 0x0003, /* last, next, redo, dump, goto */
 -    0x363c, 0x3558, 0x2774, 0x26b0, 0x018f, /* open */
++    0x477c, 0x0003, /* last, next, redo, dump, goto */
++    0x371c, 0x3638, 0x2774, 0x26b0, 0x018f, /* open */
+     0x1cd0, 0x1f2c, 0x1de8, 0x1ba4, 0x0003, /* ftrread, ftrwrite, ftrexec, fteread, ftewrite, fteexec */
+     0x1cd0, 0x1f2c, 0x1de8, 0x0003, /* ftis, ftsize, ftmtime, ftatime, ftctime, ftrowned, fteowned, ftzero, ftsock, ftchr, ftblk, ftfile, ftdir, ftpipe, ftsuid, ftsgid, ftsvtx, ftlink, fttty, fttext, ftbinary */
 -    0x4411, /* wait, getppid, time */
 -    0x3794, 0x0df0, 0x084c, 0x44e8, 0x2244, 0x0003, /* entereval */
++    0x44f1, /* wait, getppid, time */
++    0x3874, 0x0df0, 0x084c, 0x45c8, 0x2244, 0x0003, /* entereval */
+     0x307c, 0x0018, 0x1284, 0x11a1, /* coreargs */
+     0x2fac, 0x00c7, /* avhvswitch */
+     0x2ebc, 0x01fb, /* padrange */
 -    0x2ebc, 0x3fb8, 0x04f6, 0x298c, 0x1888, 0x0067, /* refassign */
 -    0x2ebc, 0x3fb8, 0x04f6, 0x298c, 0x1888, 0x0003, /* lvref */
++    0x2ebc, 0x4098, 0x04f6, 0x298c, 0x1888, 0x0067, /* refassign */
++    0x2ebc, 0x4098, 0x04f6, 0x298c, 0x1888, 0x0003, /* lvref */
+     0x2ebd, /* lvrefslice */
 -    0x2ebc, 0x3fb8, 0x0003, /* lvavref */
++    0x2ebc, 0x4098, 0x0003, /* lvavref */
  
  };
  

diff --cc perl.h
Simple merge

diff --cc pod/perldelta.pod
index 8f3b6e3,7a09daf..1f68d4c
--- 1/pod/perldelta.pod
--- 2/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@@ -50,19 -45,46 +50,59 @@@ XXX For a release on a stable branch, t
  
  [ List each incompatible change as a =head2 entry ]
  
+ =head2 Smartmatch and switch simplification
+ 
+ The experimental smart match operator (C<~~>) and switch
+ (C<given>/C<when>) constructs have been drastically simplified, in a
+ way that will require most uses of them to be updated.
+ 
+ The smart match operator no longer has its large table of matching rules.
+ Instead there is just one rule: the right-hand operand must overload
+ the operator.  Overloaded objects now bear the entire responsibility
+ for determining what kind of match to perform.  The operator also no
+ longer implicitly enreferences certain kinds of operand (such as arrays);
+ instead the operands get regular scalar context.
+ 
+ The C<when> construct no longer has its complicated rules about how
+ to treat its argument.  Instead it has been split into two distinct
+ constructs.  C<whereso> always uses the argument as a truth value,
+ and C<whereis> always smart matches.  Like the smart match operator,
+ these also no longer implicitly enreference certain kinds of argument,
+ instead supplying regular scalar context.
+ 
+ The C<default> construct, which was misleading and essentially useless,
+ has been removed.
+ 
+ The C<given> construct also no longer implicitly enreferences certain
+ kinds of arguments, instead supplying regular scalar context.  In this
+ case, the implicit enreferencement was undocumented anyway.
+ 
+ Flow control of switch constructs has been unified with loop flow
+ control.  The concept of "topicalizer" (referring to a C<given> block
+ or a C<foreach> loop acting on C<$_>) has been abolished.  A C<given>
+ construct now counts as a one-iteration loop, so responds to the loop
+ control keywords.  The C<break> keyword has consequently been removed,
+ in favour of using C<next> or C<last> to exit a C<given>.  The implicit
+ jump at the end of a C<when> block is now a C<next>, and so is applicable
+ not just to C<given> and some kinds of C<foreach> but to any loop.
+ 
+ It is known that these changes will break some users of L<autodie>,
+ the documentation of which has long recommended some uses of these
+ experimental features that are not portable across these changes.
+ 
 +=head2 Over-radix digits in floating point literals
 +
 +Octal and binary floating point literals used to permit any hexadecimal
 +digit to appear after the radix point.  The digits are now restricted
 +to those appropriate for the radix, as digits before the radix point
 +always were.
 +
 +=head2 Return type of C<unpackstring()>
 +
 +The return types of the C API functions C<unpackstring()> and
 +C<unpack_str()> have changed from C<I32> to C<SSize_t>, in order to
 +accommodate datasets of more than two billion items.
 +
  =head1 Deprecations
  
  XXX Any deprecated features, syntax, modules etc. should be listed here.

diff --cc pod/perldiag.pod
Simple merge

diff --cc pod/perlfunc.pod
Simple merge

diff --cc pod/perlop.pod
Simple merge

diff --cc pod/perlsyn.pod
Simple merge

diff --cc pp_ctl.c
Simple merge

diff --cc proto.h
Simple merge

diff --cc regen/op_private
Simple merge

diff --cc sv.c
Simple merge

diff --cc t/lib/croak/pp_ctl
Simple merge

diff --cc t/lib/warnings/op
Simple merge

diff --cc t/op/coreamp.t
Simple merge

diff --cc t/op/state.t
Simple merge

diff --cc t/porting/customized.dat
index 3787dfa,40f3e31..9c9b00d
--- 1/t/porting/customized.dat
--- 2/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@@ -20,7 -20,12 +20,12 @@@ Pod::Checker cpan/Pod-Checker/t/pod/tes
  Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 582be34c077c9ff44d99914724a0cc2140bcd48c
  Socket cpan/Socket/Socket.pm ee83312b6e3e0185af8d41a18635913d84b1b651
  Socket cpan/Socket/Socket.xs edd4fed212785f11c5c2095a75941dad27d586d9
+ autodie cpan/autodie/lib/autodie/exception.pm 69eb9198238b0cd013fcb774df11ee939f667beb
+ autodie cpan/autodie/lib/autodie/hints.pm e1998fec61fb4e82fe46585bd82c73200be6f262
+ autodie cpan/autodie/t/exceptions.t ad315a208f875e06b0964012ce8d65daa438c036
+ autodie cpan/autodie/t/lib/Hints_pod_examples.pm 6944c218e9754b3613c8d0c90a5ae8aceccb5c99
  autodie cpan/autodie/t/mkdir.t 9e70d2282a3cc7d76a78bf8144fccba20fb37dac
 -experimental cpan/experimental/t/basic.t 4f0396c10b29eddb733f70f66c776fb10bd53a1d
++experimental cpan/experimental/t/basic.t 779e0dd420779467b4080ba3d1c857f7d941be8d
  perlfaq cpan/perlfaq/lib/perlfaq5.pod bcc1b6af3b6dff3973643acf8d5e741463374123
  perlfaq cpan/perlfaq/lib/perlfaq8.pod bffbc0c8fa828aead24e0891a5e789369a8e0743
  podlators pod/perlpodstyle.pod c6500c9950b46e8228d4adbc09a3ee2ef23de2d0

diff --cc t/run/switches.t
Simple merge

diff --cc toke.c
Simple merge