rip out quicksort and sort algorithm control

[perl #119635]

1 files changed, 102 insertions, 104 deletions

diff --git a/opcode.h b/opcode.h
index 10e68168de..b5ed37ff35 100644
--- a/opcode.h
+++ b/opcode.h
@@ -2267,7 +2267,6 @@ END_EXTERN_C
 #define OPpMULTICONCAT_FAKE     0x20
 #define OPpMULTIDEREF_DELETE    0x20
 #define OPpOPEN_IN_CRLF         0x20
-#define OPpSORT_QSORT           0x20
 #define OPpTRANS_COMPLEMENT     0x20
 #define OPpTRUEBOOL             0x20
 #define OPpDEREF                0x30
@@ -2400,7 +2399,6 @@ EXTCONST char PL_op_private_labels[] = {
     'O','U','R','I','N','T','R','\0',
     'O','U','T','B','I','N','\0',
     'O','U','T','C','R','\0',
-    'Q','S','O','R','T','\0',
     'R','E','F','C','\0',
     'R','E','P','A','R','S','E','\0',
     'R','E','P','L','1','S','T','\0',
@@ -2442,14 +2440,14 @@ EXTCONST char PL_op_private_labels[] = {
 EXTCONST I16 PL_op_private_bitfields[] = {
     0, 8, -1,
     0, 8, -1,
-    0, 582, -1,
+    0, 576, -1,
     0, 8, -1,
     0, 8, -1,
-    0, 589, -1,
-    0, 578, -1,
-    1, -1, 0, 546, 1, 40, 2, 290, -1,
+    0, 583, -1,
+    0, 572, -1,
+    1, -1, 0, 540, 1, 40, 2, 290, -1,
     4, -1, 1, 171, 2, 178, 3, 185, -1,
-    4, -1, 0, 546, 1, 40, 2, 290, 3, 117, -1,
+    4, -1, 0, 540, 1, 40, 2, 290, 3, 117, -1,
 
 };
 
@@ -2626,49 +2624,49 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* shift */
       90, /* unshift */
      149, /* sort */
-     157, /* reverse */
+     156, /* reverse */
        0, /* grepstart */
-     159, /* grepwhile */
+     158, /* grepwhile */
        0, /* mapstart */
        0, /* mapwhile */
        0, /* range */
-     161, /* flip */
-     161, /* flop */
+     160, /* flip */
+     160, /* flop */
        0, /* and */
        0, /* or */
       12, /* xor */
        0, /* dor */
-     163, /* cond_expr */
+     162, /* cond_expr */
        0, /* andassign */
        0, /* orassign */
        0, /* dorassign */
-     165, /* entersub */
-     172, /* leavesub */
-     172, /* leavesublv */
+     164, /* entersub */
+     171, /* leavesub */
+     171, /* leavesublv */
        0, /* argcheck */
-     174, /* argelem */
+     173, /* argelem */
        0, /* argdefelem */
-     176, /* caller */
+     175, /* caller */
       52, /* warn */
       52, /* die */
       52, /* reset */
       -1, /* lineseq */
-     178, /* nextstate */
-     178, /* dbstate */
+     177, /* nextstate */
+     177, /* dbstate */
       -1, /* unstack */
       -1, /* enter */
-     179, /* leave */
+     178, /* leave */
       -1, /* scope */
-     181, /* enteriter */
-     185, /* iter */
+     180, /* enteriter */
+     184, /* iter */
       -1, /* enterloop */
-     186, /* leaveloop */
+     185, /* leaveloop */
       -1, /* return */
-     188, /* last */
-     188, /* next */
-     188, /* redo */
-     188, /* dump */
-     188, /* goto */
+     187, /* last */
+     187, /* next */
+     187, /* redo */
+     187, /* dump */
+     187, /* goto */
       52, /* exit */
        0, /* method */
        0, /* method_named */
@@ -2681,7 +2679,7 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* leavewhen */
       -1, /* break */
       -1, /* continue */
-     190, /* open */
+     189, /* open */
       52, /* close */
       52, /* pipe_op */
       52, /* fileno */
@@ -2697,7 +2695,7 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
       52, /* getc */
       52, /* read */
       52, /* enterwrite */
-     172, /* leavewrite */
+     171, /* leavewrite */
       -1, /* prtf */
       -1, /* print */
       -1, /* say */
@@ -2727,33 +2725,33 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* getpeername */
        0, /* lstat */
        0, /* stat */
-     195, /* ftrread */
-     195, /* ftrwrite */
-     195, /* ftrexec */
-     195, /* fteread */
-     195, /* ftewrite */
-     195, /* fteexec */
-     200, /* ftis */
-     200, /* ftsize */
-     200, /* ftmtime */
-     200, /* ftatime */
-     200, /* ftctime */
-     200, /* ftrowned */
-     200, /* fteowned */
-     200, /* ftzero */
-     200, /* ftsock */
-     200, /* ftchr */
-     200, /* ftblk */
-     200, /* ftfile */
-     200, /* ftdir */
-     200, /* ftpipe */
-     200, /* ftsuid */
-     200, /* ftsgid */
-     200, /* ftsvtx */
-     200, /* ftlink */
-     200, /* fttty */
-     200, /* fttext */
-     200, /* ftbinary */
+     194, /* ftrread */
+     194, /* ftrwrite */
+     194, /* ftrexec */
+     194, /* fteread */
+     194, /* ftewrite */
+     194, /* fteexec */
+     199, /* ftis */
+     199, /* ftsize */
+     199, /* ftmtime */
+     199, /* ftatime */
+     199, /* ftctime */
+     199, /* ftrowned */
+     199, /* fteowned */
+     199, /* ftzero */
+     199, /* ftsock */
+     199, /* ftchr */
+     199, /* ftblk */
+     199, /* ftfile */
+     199, /* ftdir */
+     199, /* ftpipe */
+     199, /* ftsuid */
+     199, /* ftsgid */
+     199, /* ftsvtx */
+     199, /* ftlink */
+     199, /* fttty */
+     199, /* fttext */
+     199, /* ftbinary */
       90, /* chdir */
       90, /* chown */
       75, /* chroot */
@@ -2773,17 +2771,17 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* rewinddir */
        0, /* closedir */
       -1, /* fork */
-     204, /* wait */
+     203, /* wait */
       90, /* waitpid */
       90, /* system */
       90, /* exec */
       90, /* kill */
-     204, /* getppid */
+     203, /* getppid */
       90, /* getpgrp */
       90, /* setpgrp */
       90, /* getpriority */
       90, /* setpriority */
-     204, /* time */
+     203, /* time */
       -1, /* tms */
        0, /* localtime */
       52, /* gmtime */
@@ -2803,8 +2801,8 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* require */
        0, /* dofile */
       -1, /* hintseval */
-     205, /* entereval */
-     172, /* leaveeval */
+     204, /* entereval */
+     171, /* leaveeval */
        0, /* entertry */
       -1, /* leavetry */
        0, /* ghbyname */
@@ -2842,18 +2840,18 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* lock */
        0, /* once */
       -1, /* custom */
-     211, /* coreargs */
-     215, /* avhvswitch */
+     210, /* coreargs */
+     214, /* avhvswitch */
        3, /* runcv */
        0, /* fc */
       -1, /* padcv */
       -1, /* introcv */
       -1, /* clonecv */
-     217, /* padrange */
-     219, /* refassign */
-     225, /* lvref */
-     231, /* lvrefslice */
-     232, /* lvavref */
+     216, /* padrange */
+     218, /* refassign */
+     224, /* lvref */
+     230, /* lvrefslice */
+     231, /* lvavref */
        0, /* anonconst */
 
 };
@@ -2874,74 +2872,74 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
 
 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, 0x40f9, /* pushmark */
+    0x2f3c, 0x4039, /* pushmark */
     0x00bd, /* wantarray, runcv */
-    0x0578, 0x19b0, 0x41ac, 0x3c68, 0x3385, /* const */
+    0x0578, 0x19b0, 0x40ec, 0x3ba8, 0x3385, /* const */
     0x2f3c, 0x34d9, /* gvsv */
     0x1815, /* 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, 0x40f8, 0x03d7, /* padsv */
-    0x2f3c, 0x40f8, 0x06f4, 0x302c, 0x3de9, /* padav */
-    0x2f3c, 0x40f8, 0x06f4, 0x0790, 0x302c, 0x3de8, 0x2aa1, /* padhv */
-    0x2f3c, 0x1b98, 0x03d6, 0x302c, 0x32a8, 0x41a4, 0x0003, /* rv2gv */
-    0x2f3c, 0x34d8, 0x03d6, 0x41a4, 0x0003, /* rv2sv */
+    0x2f3c, 0x4038, 0x03d7, /* padsv */
+    0x2f3c, 0x4038, 0x06f4, 0x302c, 0x3d29, /* padav */
+    0x2f3c, 0x4038, 0x06f4, 0x0790, 0x302c, 0x3d28, 0x2aa1, /* padhv */
+    0x2f3c, 0x1b98, 0x03d6, 0x302c, 0x32a8, 0x40e4, 0x0003, /* rv2gv */
+    0x2f3c, 0x34d8, 0x03d6, 0x40e4, 0x0003, /* rv2sv */
     0x302c, 0x0003, /* av2arylen, akeys, values, keys */
-    0x321c, 0x0fd8, 0x0d34, 0x028c, 0x44a8, 0x41a4, 0x0003, /* rv2cv */
+    0x321c, 0x0fd8, 0x0d34, 0x028c, 0x43e8, 0x40e4, 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 */
     0x36bc, 0x35d8, 0x27f4, 0x2730, 0x0003, /* backtick */
     0x06f5, /* subst */
-    0x10dc, 0x2118, 0x0914, 0x3f2c, 0x24a8, 0x01e4, 0x0141, /* trans, transr */
+    0x10dc, 0x2118, 0x0914, 0x3e6c, 0x24a8, 0x01e4, 0x0141, /* trans, transr */
     0x0f1c, 0x0618, 0x0067, /* sassign */
     0x0bd8, 0x0ad4, 0x09d0, 0x302c, 0x06e8, 0x0067, /* aassign */
-    0x4550, 0x0003, /* chomp, schomp, ncomplement, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, ord, chr, chroot, rmdir */
+    0x4490, 0x0003, /* chomp, schomp, ncomplement, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, ord, chr, chroot, rmdir */
     0x06f4, 0x302c, 0x0003, /* pos */
-    0x4550, 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 */
+    0x4490, 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 */
     0x1498, 0x0067, /* repeat */
-    0x2f3c, 0x0358, 0x1b94, 0x4550, 0x428c, 0x0003, /* multiconcat */
-    0x4550, 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, 0x4550, 0x0003, /* length */
-    0x39d0, 0x302c, 0x012b, /* substr */
+    0x2f3c, 0x0358, 0x1b94, 0x4490, 0x41cc, 0x0003, /* multiconcat */
+    0x4490, 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, 0x4490, 0x0003, /* length */
+    0x3910, 0x302c, 0x012b, /* substr */
     0x302c, 0x0067, /* vec */
-    0x3198, 0x06f4, 0x4550, 0x018f, /* index, rindex */
-    0x2f3c, 0x34d8, 0x06f4, 0x302c, 0x3de8, 0x41a4, 0x0003, /* rv2av */
+    0x3198, 0x06f4, 0x4490, 0x018f, /* index, rindex */
+    0x2f3c, 0x34d8, 0x06f4, 0x302c, 0x3d28, 0x40e4, 0x0003, /* rv2av */
     0x025f, /* aelemfast, aelemfast_lex */
     0x2f3c, 0x2e38, 0x03d6, 0x302c, 0x0067, /* aelem, helem */
-    0x2f3c, 0x302c, 0x3de9, /* aslice, hslice */
+    0x2f3c, 0x302c, 0x3d29, /* aslice, hslice */
     0x302d, /* kvaslice, kvhslice */
-    0x2f3c, 0x3d38, 0x2b54, 0x0003, /* delete */
-    0x43d8, 0x0003, /* exists */
-    0x2f3c, 0x34d8, 0x06f4, 0x0790, 0x302c, 0x3de8, 0x41a4, 0x2aa1, /* rv2hv */
-    0x2f3c, 0x2e38, 0x1154, 0x1ab0, 0x302c, 0x41a4, 0x0003, /* multideref */
+    0x2f3c, 0x3c78, 0x2b54, 0x0003, /* delete */
+    0x4318, 0x0003, /* exists */
+    0x2f3c, 0x34d8, 0x06f4, 0x0790, 0x302c, 0x3d28, 0x40e4, 0x2aa1, /* rv2hv */
+    0x2f3c, 0x2e38, 0x1154, 0x1ab0, 0x302c, 0x40e4, 0x0003, /* multideref */
     0x2f3c, 0x34d8, 0x0430, 0x2c4c, 0x2569, /* split */
     0x2f3c, 0x21d9, /* list */
-    0x46bc, 0x4018, 0x3774, 0x13f0, 0x288c, 0x3ac8, 0x2984, 0x3441, /* sort */
+    0x45fc, 0x3f58, 0x13f0, 0x288c, 0x3a08, 0x2984, 0x3441, /* sort */
     0x288c, 0x0003, /* reverse */
     0x06f4, 0x0003, /* grepwhile */
     0x2cd8, 0x0003, /* flip, flop */
     0x2f3c, 0x0003, /* cond_expr */
-    0x2f3c, 0x0fd8, 0x03d6, 0x028c, 0x44a8, 0x41a4, 0x2641, /* entersub */
-    0x3838, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */
+    0x2f3c, 0x0fd8, 0x03d6, 0x028c, 0x43e8, 0x40e4, 0x2641, /* entersub */
+    0x3778, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */
     0x02aa, 0x0003, /* argelem */
     0x00bc, 0x018f, /* caller */
     0x23b5, /* nextstate, dbstate */
-    0x2ddc, 0x3839, /* leave */
-    0x2f3c, 0x34d8, 0x104c, 0x3b45, /* enteriter */
-    0x3b45, /* iter */
+    0x2ddc, 0x3779, /* leave */
+    0x2f3c, 0x34d8, 0x104c, 0x3a85, /* enteriter */
+    0x3a85, /* iter */
     0x2ddc, 0x0067, /* leaveloop */
-    0x47dc, 0x0003, /* last, next, redo, dump, goto */
+    0x471c, 0x0003, /* last, next, redo, dump, goto */
     0x36bc, 0x35d8, 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 */
-    0x4551, /* wait, getppid, time */
-    0x38d4, 0x0df0, 0x084c, 0x4628, 0x22c4, 0x0003, /* entereval */
+    0x4491, /* wait, getppid, time */
+    0x3814, 0x0df0, 0x084c, 0x4568, 0x22c4, 0x0003, /* entereval */
     0x30fc, 0x0018, 0x1304, 0x1221, /* coreargs */
     0x302c, 0x00c7, /* avhvswitch */
     0x2f3c, 0x01fb, /* padrange */
-    0x2f3c, 0x40f8, 0x04f6, 0x2a0c, 0x1908, 0x0067, /* refassign */
-    0x2f3c, 0x40f8, 0x04f6, 0x2a0c, 0x1908, 0x0003, /* lvref */
+    0x2f3c, 0x4038, 0x04f6, 0x2a0c, 0x1908, 0x0067, /* refassign */
+    0x2f3c, 0x4038, 0x04f6, 0x2a0c, 0x1908, 0x0003, /* lvref */
     0x2f3d, /* lvrefslice */
-    0x2f3c, 0x40f8, 0x0003, /* lvavref */
+    0x2f3c, 0x4038, 0x0003, /* lvavref */
 
 };
 
@@ -3117,7 +3115,7 @@ EXTCONST U8 PL_op_private_valid[] = {
     /* POP        */ (OPpARG1_MASK),
     /* SHIFT      */ (OPpARG1_MASK),
     /* UNSHIFT    */ (OPpARG4_MASK|OPpTARGET_MY),
-    /* SORT       */ (OPpSORT_NUMERIC|OPpSORT_INTEGER|OPpSORT_REVERSE|OPpSORT_INPLACE|OPpSORT_DESCEND|OPpSORT_QSORT|OPpSORT_STABLE|OPpSORT_UNSTABLE),
+    /* SORT       */ (OPpSORT_NUMERIC|OPpSORT_INTEGER|OPpSORT_REVERSE|OPpSORT_INPLACE|OPpSORT_DESCEND|OPpSORT_STABLE|OPpSORT_UNSTABLE),
     /* REVERSE    */ (OPpARG1_MASK|OPpREVERSE_INPLACE),
     /* GREPSTART  */ (OPpARG1_MASK),
     /* GREPWHILE  */ (OPpARG1_MASK|OPpTRUEBOOL),