@scriptc/compiler 0.3.2 → 0.3.4

package/dist/frontend/lowering/lower-array-sort.js

@@ -1,4 +1,4 @@
-import { BOOL, BYTES_U8, F64, VOID, arrayOf, funcOf, } from "../../ir/ir.js";
+import { BOOL, F64, VOID, UNDEFINED_T, arrayOf, funcOf, } from "../../ir/ir.js";
 import { numLit } from "../../ir/build.js";
 import { transformStmtList } from "../../ir/traverse.js";
 /** Small IR vocabulary shared by the array and byte sort helpers. */
@@ -118,140 +118,492 @@ function distinctNodes(body) {
         stmt: (node) => (node.kind === "break" ? { ...node } : node),
     });
 }
-/** Stable natural merge sort over an owned snapshot. Strict descending runs
- * can be reversed without reversing ties. Short runs use bounded binary
- * insertion; merge passes then consume pairs of complete runs. The boundary
- * table compacts in place, and a single run needs no scratch buffer at all.
- * Comparator scheduling is intentionally unspecified, as for the previous
- * bottom-up sorter. Every callback still uses ordinary IR exception/ownership
- * handling; the caller's array is only written after sorting succeeds. */
-function stableSort(b, src, n, greater) {
+/** V8's TimSort (third_party/v8/builtins/array-sort.tq) over the first `n`
+ * slots of an owned snapshot, step for step like the runtime's
+ * (scr_array.c): the same minimum run length, run detection, binary
+ * insertion, run-stack invariants, galloping merges and adaptive gallop
+ * threshold. Every comparison is `less(x, y)`, the comparator's
+ * `f(x, y) < 0`, so the comparator sees Node's calls in Node's order. Every
+ * callback still uses ordinary IR exception/ownership handling; the
+ * caller's array is only written after sorting succeeds. */
+function timSort(b, src, n, less) {
+    return [b.branch(b.lt(b.num(1), n), timSortBody(b, src, n, less))];
+}
+function timSortBody(b, src, n, less) {
     const elem = src.type.kind === "array" ? src.type.elem : F64;
-    const dst = b.local("dst", src.type);
-    const tmp = b.local("tmp", src.type);
-    const runs = b.local("runs", arrayOf(F64));
-    const runCount = b.local("runCount");
-    const start = b.local("start");
-    const end = b.local("end");
-    const descending = b.local("descending", BOOL);
-    const left = b.local("left");
-    const right = b.local("right");
-    const pivot = b.local("pivot", elem);
-    const low = b.local("low");
-    const high = b.local("high");
-    const center = b.local("center");
-    const limit = b.local("limit");
-    const i = b.local("i");
-    const j = b.local("j");
-    const k = b.local("k");
-    const mid = b.local("mid");
-    const run = b.local("run");
-    const nextRun = b.local("nextRun");
-    const vLeft = b.local("vLeft", elem);
-    const vRight = b.local("vRight", elem);
-    const boundaryLeft = b.local("boundaryLeft", elem);
-    const boundaryRight = b.local("boundaryRight", elem);
+    const loc = b.loc;
+    let labels = 0;
+    const local = (name, type = F64) => b.local(name, type);
     const zero = b.num(0), one = b.num(1), two = b.num(2);
-    const at = (index) => b.at(src, index);
-    const copy = (index, stop) => b.while(b.lt(index, stop), [b.set(dst, k, at(index)), b.step(index), b.step(k)]);
-    const merge = [
-        b.bind(vLeft, at(i)),
-        b.bind(vRight, at(j)),
-        b.while({
-            kind: "logical",
-            op: "&&",
-            left: b.lt(i, mid),
-            right: b.lt(j, right),
-            type: BOOL,
-            loc: b.loc,
-        }, [
-            b.branch(greater(vLeft, vRight), [b.set(dst, k, vRight), b.step(j), b.branch(b.lt(j, right), [b.assign(vRight, at(j))])], [b.set(dst, k, vLeft), b.step(i), b.branch(b.lt(i, mid), [b.assign(vLeft, at(i))])]),
-            b.step(k),
+    const at = (arr, index) => b.at(arr, index);
+    const ge = (left, right) => b.not(b.lt(left, right));
+    const le = (left, right) => b.not(b.lt(right, left));
+    const and = (left, right) => ({
+        kind: "logical",
+        op: "&&",
+        left,
+        right,
+        type: BOOL,
+        loc,
+    });
+    const or = (left, right) => ({
+        kind: "logical",
+        op: "||",
+        left,
+        right,
+        type: BOOL,
+        loc,
+    });
+    const truth = { kind: "boolLit", value: true, type: BOOL, loc };
+    const forever = (body) => b.while(truth, body);
+    const brk = (label) => ({ kind: "break", ...(label ? { label } : {}), loc });
+    const block = (label, body) => ({
+        kind: "block",
+        body,
+        labels: [label],
+        loc,
+    });
+    const half = (low, high) => b.add(low, {
+        kind: "libCall",
+        fn: "math.floor",
+        args: [{ kind: "bin", op: "/", left: b.sub(high, low), right: two, type: F64, loc }],
+        type: F64,
+        loc,
+    });
+    const min = (x, y) => b.choose(b.lt(x, y), x, y);
+    /** Copies `count` slots between arrays (or within one, front to back). */
+    const copyForward = (from, fromAt, to, toAt, count) => [
+        b.assign(cp, zero),
+        b.while(b.lt(cp, count), [b.set(to, b.add(toAt, cp), at(from, b.add(fromAt, cp))), b.step(cp)]),
+    ];
+    /** Copies `count` slots within `src` back to front (overlap to the right). */
+    const copyBackward = (fromAt, toAt, count) => [
+        b.assign(cp, count),
+        b.while(b.lt(zero, cp), [
+            b.step(cp, -1),
+            b.set(src, b.add(toAt, cp), at(src, b.add(fromAt, cp))),
         ]),
-        copy(i, mid),
-        copy(j, right),
     ];
-    return [
-        b.bind(runs, { kind: "arrayLit", elems: [zero], type: runs.type, loc: b.loc }),
-        b.bind(runCount, one),
-        b.bind(start, zero),
-        b.while(b.lt(start, n), [
-            b.bind(end, b.add(start, one)),
-            b.branch(b.lt(end, n), [
-                b.bind(descending, greater(at(start), at(end))),
-                b.step(end),
-                b.while(b.lt(end, n), [
-                    b.branch(b.choose(descending, greater(at(b.sub(end, one)), at(end)), b.not(greater(at(b.sub(end, one)), at(end)))), [b.step(end)], [{ kind: "break", loc: b.loc }]),
+    const minGallop = local("minGallop");
+    const runBase = local("runBase", arrayOf(F64));
+    const runLen = local("runLen", arrayOf(F64));
+    const runs = local("runs");
+    const cp = local("copyIndex");
+    // Gallop search state; searches never nest.
+    const gLast = local("gallopLast");
+    const gOfs = local("gallopOffset");
+    const gMax = local("gallopMax");
+    const gMid = local("gallopMid");
+    const gTmp = local("gallopTmp");
+    const gBase = local("gallopBase");
+    const gLength = local("gallopLength");
+    const gHint = local("gallopHint");
+    const gKey = local("gallopKey", elem);
+    /** gallopLeft/gallopRight: assigns `out` the offset k in [0, length] of
+     * `key` in arr[base .. base + length), starting the search at `hint`. */
+    const gallop = (right, out, arr, key, base, lengthExpr, hintExpr) => {
+        // gallopLeft tests arr[i] < key; gallopRight tests key < arr[i].
+        const probe = (index) => right ? less(gKey, at(arr, b.add(gBase, index))) : less(at(arr, b.add(gBase, index)), gKey);
+        // Whether the search moves right (toward higher indices) from the hint.
+        const towardHigh = right ? b.not(probe(gHint)) : probe(gHint);
+        const advance = () => [b.assign(gLast, gOfs), b.assign(gOfs, b.add(b.add(gOfs, gOfs), one))];
+        const length = gLength, hint = gHint;
+        const body = [
+            b.bind(gKey, key),
+            b.assign(gBase, base),
+            b.assign(gLength, lengthExpr),
+            b.assign(gHint, hintExpr),
+            b.assign(gLast, zero),
+            b.assign(gOfs, one),
+            b.branch(towardHigh, [
+                b.assign(gMax, b.sub(length, hint)),
+                b.while(b.lt(gOfs, gMax), [
+                    // Stop at the first element the key does not pass.
+                    b.branch(right ? probe(b.add(hint, gOfs)) : b.not(probe(b.add(hint, gOfs))), [brk()]),
+                    ...advance(),
+                ]),
+                b.branch(b.lt(gMax, gOfs), [b.assign(gOfs, gMax)]),
+                b.assign(gLast, b.add(gLast, hint)),
+                b.assign(gOfs, b.add(gOfs, hint)),
+            ], [
+                b.assign(gMax, b.add(hint, one)),
+                b.while(b.lt(gOfs, gMax), [
+                    b.branch(right ? b.not(probe(b.sub(hint, gOfs))) : probe(b.sub(hint, gOfs)), [brk()]),
+                    ...advance(),
                 ]),
-                b.branch(descending, [
-                    b.bind(left, start),
-                    b.bind(right, b.sub(end, one)),
-                    b.while(b.lt(left, right), [
-                        b.bind(vLeft, at(left)),
-                        b.bind(vRight, at(right)),
-                        b.set(src, left, vRight),
-                        b.set(src, right, vLeft),
-                        b.step(left),
-                        b.step(right, -1),
+                b.branch(b.lt(gMax, gOfs), [b.assign(gOfs, gMax)]),
+                b.assign(gTmp, gLast),
+                b.assign(gLast, b.sub(hint, gOfs)),
+                b.assign(gOfs, b.sub(hint, gTmp)),
+            ]),
+            b.step(gLast),
+            b.while(b.lt(gLast, gOfs), [
+                b.assign(gMid, half(gLast, gOfs)),
+                b.branch(probe(gMid), right ? [b.assign(gOfs, gMid)] : [b.assign(gLast, b.add(gMid, one))], right ? [b.assign(gLast, b.add(gMid, one))] : [b.assign(gOfs, gMid)]),
+            ]),
+            b.assign(out, gOfs),
+        ];
+        return [{ kind: "block", body, loc }];
+    };
+    // Merge state (merges never nest).
+    const tmp = local("mergeTmp", src.type);
+    const baseA = local("baseA");
+    const lenA = local("lenA");
+    const baseB = local("baseB");
+    const lenB = local("lenB");
+    const dest = local("dest");
+    const cursorT = local("cursorT");
+    const cursorX = local("cursorX");
+    const winsA = local("winsA");
+    const winsB = local("winsB");
+    const firstPass = local("firstPass", BOOL);
+    const k = local("mergeK");
+    const takeTmp = (count, from) => [
+        b.bind(tmp, b.allocate(src.type, count)),
+        ...copyForward(src, from, tmp, zero, count),
+    ];
+    const lowerGallop = (value) => b.assign(minGallop, b.choose(b.lt(one, value), b.sub(value, one), one));
+    const enoughWins = () => or(or(ge(winsA, b.num(7)), ge(winsB, b.num(7))), firstPass);
+    const mergeLow = () => {
+        const id = labels++;
+        const succeed = `ts.low${id}.succeed`, copyB = `ts.low${id}.copyB`, exit = `ts.low${id}.exit`;
+        const moveB = [b.set(src, dest, at(src, cursorX)), b.step(dest), b.step(cursorX)];
+        const moveT = [b.set(src, dest, at(tmp, cursorT)), b.step(dest), b.step(cursorT)];
+        return [
+            ...takeTmp(lenA, baseA),
+            b.assign(dest, baseA),
+            b.assign(cursorT, zero),
+            b.assign(cursorX, baseB),
+            ...moveB,
+            block(exit, [
+                block(copyB, [
+                    block(succeed, [
+                        b.step(lenB, -1),
+                        b.branch(b.eq(lenB, zero), [brk(succeed)]),
+                        b.branch(b.eq(lenA, one), [brk(copyB)]),
+                        forever([
+                            b.assign(winsA, zero),
+                            b.assign(winsB, zero),
+                            forever([
+                                b.branch(less(at(src, cursorX), at(tmp, cursorT)), [
+                                    ...moveB,
+                                    b.step(winsB),
+                                    b.step(lenB, -1),
+                                    b.assign(winsA, zero),
+                                    b.branch(b.eq(lenB, zero), [brk(succeed)]),
+                                    b.branch(ge(winsB, minGallop), [brk()]),
+                                ], [
+                                    ...moveT,
+                                    b.step(winsA),
+                                    b.step(lenA, -1),
+                                    b.assign(winsB, zero),
+                                    b.branch(b.eq(lenA, one), [brk(copyB)]),
+                                    b.branch(ge(winsA, minGallop), [brk()]),
+                                ]),
+                            ]),
+                            b.step(minGallop),
+                            b.assign(firstPass, truth),
+                            b.while(enoughWins(), [
+                                b.assign(firstPass, { kind: "boolLit", value: false, type: BOOL, loc }),
+                                lowerGallop(minGallop),
+                                ...gallop(true, winsA, tmp, at(src, cursorX), cursorT, lenA, zero),
+                                b.branch(b.lt(zero, winsA), [
+                                    ...copyForward(tmp, cursorT, src, dest, winsA),
+                                    b.assign(dest, b.add(dest, winsA)),
+                                    b.assign(cursorT, b.add(cursorT, winsA)),
+                                    b.assign(lenA, b.sub(lenA, winsA)),
+                                    b.branch(b.eq(lenA, one), [brk(copyB)]),
+                                    b.branch(b.eq(lenA, zero), [brk(succeed)]),
+                                ]),
+                                ...moveB,
+                                b.step(lenB, -1),
+                                b.branch(b.eq(lenB, zero), [brk(succeed)]),
+                                ...gallop(false, winsB, src, at(tmp, cursorT), cursorX, lenB, zero),
+                                b.branch(b.lt(zero, winsB), [
+                                    ...copyForward(src, cursorX, src, dest, winsB),
+                                    b.assign(dest, b.add(dest, winsB)),
+                                    b.assign(cursorX, b.add(cursorX, winsB)),
+                                    b.assign(lenB, b.sub(lenB, winsB)),
+                                    b.branch(b.eq(lenB, zero), [brk(succeed)]),
+                                ]),
+                                ...moveT,
+                                b.step(lenA, -1),
+                                b.branch(b.eq(lenA, one), [brk(copyB)]),
+                            ]),
+                            b.step(minGallop),
+                        ]),
                     ]),
+                    // succeed
+                    ...copyForward(tmp, cursorT, src, dest, lenA),
+                    brk(exit),
                 ]),
+                // copyB: the last element of run A belongs at the end of the merge.
+                ...copyForward(src, cursorX, src, dest, lenB),
+                b.set(src, b.add(dest, lenB), at(tmp, cursorT)),
             ]),
-            // Bound insertion movement while avoiding tiny merge runs.
-            b.bind(limit, b.choose(b.lt(b.add(start, b.num(16)), n), b.add(start, b.num(16)), n)),
-            b.while(b.lt(end, limit), [
-                b.bind(pivot, at(end)),
-                b.bind(low, start),
-                b.bind(high, end),
-                b.while(b.lt(low, high), [
-                    b.bind(center, {
-                        kind: "libCall",
-                        fn: "math.floor",
-                        args: [
-                            { kind: "bin", op: "/", left: b.add(low, high), right: two, type: F64, loc: b.loc },
-                        ],
-                        type: F64,
-                        loc: b.loc,
-                    }),
-                    // Insert after equal values to preserve their original order.
-                    b.branch(greater(at(center), pivot), [b.assign(high, center)], [b.assign(low, b.add(center, one))]),
+        ];
+    };
+    const mergeHigh = () => {
+        const id = labels++;
+        const succeed = `ts.high${id}.succeed`, copyA = `ts.high${id}.copyA`, exit = `ts.high${id}.exit`;
+        // dest, cursorX (run A) and cursorT index their next slot.
+        const moveA = [b.set(src, dest, at(src, cursorX)), b.step(dest, -1), b.step(cursorX, -1)];
+        const moveT = [b.set(src, dest, at(tmp, cursorT)), b.step(dest, -1), b.step(cursorT, -1)];
+        return [
+            ...takeTmp(lenB, baseB),
+            b.assign(dest, b.sub(b.add(baseB, lenB), one)),
+            b.assign(cursorT, b.sub(lenB, one)),
+            b.assign(cursorX, b.sub(b.add(baseA, lenA), one)),
+            ...moveA,
+            block(exit, [
+                block(copyA, [
+                    block(succeed, [
+                        b.step(lenA, -1),
+                        b.branch(b.eq(lenA, zero), [brk(succeed)]),
+                        b.branch(b.eq(lenB, one), [brk(copyA)]),
+                        forever([
+                            b.assign(winsA, zero),
+                            b.assign(winsB, zero),
+                            forever([
+                                b.branch(less(at(tmp, cursorT), at(src, cursorX)), [
+                                    ...moveA,
+                                    b.step(winsA),
+                                    b.step(lenA, -1),
+                                    b.assign(winsB, zero),
+                                    b.branch(b.eq(lenA, zero), [brk(succeed)]),
+                                    b.branch(ge(winsA, minGallop), [brk()]),
+                                ], [
+                                    ...moveT,
+                                    b.step(winsB),
+                                    b.step(lenB, -1),
+                                    b.assign(winsA, zero),
+                                    b.branch(b.eq(lenB, one), [brk(copyA)]),
+                                    b.branch(ge(winsB, minGallop), [brk()]),
+                                ]),
+                            ]),
+                            b.step(minGallop),
+                            b.assign(firstPass, truth),
+                            b.while(enoughWins(), [
+                                b.assign(firstPass, { kind: "boolLit", value: false, type: BOOL, loc }),
+                                lowerGallop(minGallop),
+                                ...gallop(true, k, src, at(tmp, cursorT), baseA, lenA, b.sub(lenA, one)),
+                                b.assign(winsA, b.sub(lenA, k)),
+                                b.branch(b.lt(zero, winsA), [
+                                    b.assign(dest, b.sub(dest, winsA)),
+                                    b.assign(cursorX, b.sub(cursorX, winsA)),
+                                    ...copyBackward(b.add(cursorX, one), b.add(dest, one), winsA),
+                                    b.assign(lenA, b.sub(lenA, winsA)),
+                                    b.branch(b.eq(lenA, zero), [brk(succeed)]),
+                                ]),
+                                ...moveT,
+                                b.step(lenB, -1),
+                                b.branch(b.eq(lenB, one), [brk(copyA)]),
+                                ...gallop(false, k, tmp, at(src, cursorX), zero, lenB, b.sub(lenB, one)),
+                                b.assign(winsB, b.sub(lenB, k)),
+                                b.branch(b.lt(zero, winsB), [
+                                    b.assign(dest, b.sub(dest, winsB)),
+                                    b.assign(cursorT, b.sub(cursorT, winsB)),
+                                    ...copyForward(tmp, b.add(cursorT, one), src, b.add(dest, one), winsB),
+                                    b.assign(lenB, b.sub(lenB, winsB)),
+                                    b.branch(b.eq(lenB, one), [brk(copyA)]),
+                                    b.branch(b.eq(lenB, zero), [brk(succeed)]),
+                                ]),
+                                ...moveA,
+                                b.step(lenA, -1),
+                                b.branch(b.eq(lenA, zero), [brk(succeed)]),
+                            ]),
+                            b.step(minGallop),
+                        ]),
+                    ]),
+                    // succeed
+                    ...copyForward(tmp, zero, src, b.sub(dest, b.sub(lenB, one)), lenB),
+                    brk(exit),
                 ]),
-                b.bind(i, end),
-                b.while(b.lt(low, i), [b.set(src, i, at(b.sub(i, one))), b.step(i, -1)]),
-                b.set(src, low, pivot),
-                b.step(end),
+                // copyA: the first element of run B belongs at the front of the merge.
+                b.assign(dest, b.sub(dest, lenA)),
+                b.assign(cursorX, b.sub(cursorX, lenA)),
+                ...copyBackward(b.add(cursorX, one), b.add(dest, one), lenA),
+                b.set(src, dest, at(tmp, cursorT)),
             ]),
-            b.set(runs, runCount, end),
-            b.step(runCount),
-            b.assign(start, end),
-        ]),
-        b.branch(b.lt(two, runCount), [
-            b.bind(dst, b.allocate(src.type, n)),
-            b.while(b.lt(two, runCount), [
-                b.bind(run, zero),
-                b.bind(nextRun, one),
-                b.while(b.lt(b.add(run, one), runCount), [
-                    b.bind(start, b.at(runs, run)),
-                    b.bind(mid, b.at(runs, b.add(run, one))),
-                    b.bind(right, b.choose(b.lt(b.add(run, two), runCount), b.at(runs, b.add(run, two)), n)),
-                    b.bind(i, start),
-                    b.bind(j, mid),
-                    b.bind(k, start),
-                    b.branch(b.lt(mid, right), [
-                        b.bind(boundaryLeft, at(b.sub(mid, one))),
-                        b.bind(boundaryRight, at(mid)),
-                        b.branch(greater(boundaryLeft, boundaryRight), merge, [copy(i, right)]),
-                    ], [copy(i, right)]),
-                    b.set(runs, nextRun, right),
-                    b.step(nextRun),
-                    b.step(run, 2),
+        ];
+    };
+    const mergeAt = (i) => {
+        const merged = local(`mergeAt${labels++}`);
+        const id = `ts.at${labels++}`;
+        return [
+            b.bind(merged, i),
+            b.assign(baseA, at(runBase, merged)),
+            b.assign(lenA, at(runLen, merged)),
+            b.assign(baseB, at(runBase, b.add(merged, one))),
+            b.assign(lenB, at(runLen, b.add(merged, one))),
+            b.set(runLen, merged, b.add(lenA, lenB)),
+            b.branch(b.eq(b.add(merged, b.num(3)), runs), [
+                b.set(runBase, b.add(merged, one), at(runBase, b.add(merged, two))),
+                b.set(runLen, b.add(merged, one), at(runLen, b.add(merged, two))),
+            ]),
+            b.step(runs, -1),
+            block(id, [
+                ...gallop(true, k, src, at(src, baseB), baseA, lenA, zero),
+                b.assign(baseA, b.add(baseA, k)),
+                b.assign(lenA, b.sub(lenA, k)),
+                b.branch(b.eq(lenA, zero), [brk(id)]),
+                ...gallop(false, lenB, src, at(src, b.sub(b.add(baseA, lenA), one)), baseB, lenB, b.sub(lenB, one)),
+                b.branch(b.eq(lenB, zero), [brk(id)]),
+                b.branch(le(lenA, lenB), mergeLow(), mergeHigh()),
+            ]),
+        ];
+    };
+    const invariant = (m) => or(b.lt(m, two), b.lt(b.add(at(runLen, b.sub(m, one)), at(runLen, m)), at(runLen, b.sub(m, two))));
+    const top = local("top");
+    const low = local("low");
+    const remaining = local("remaining");
+    const minRun = local("minRun");
+    const minRunOdd = local("minRunOdd");
+    const runEnd = local("runEnd");
+    const descending = local("descending", BOOL);
+    const previous = local("previous", elem);
+    const pivot = local("pivot", elem);
+    const left = local("left");
+    const right = local("right");
+    const mid = local("mid");
+    const pos = local("insert");
+    const forced = local("forced");
+    const vl = local("swapLeft", elem);
+    const vr = local("swapRight", elem);
+    const length = local("runLength");
+    const scan = local("scan");
+    const half2 = (value) => ({
+        kind: "libCall",
+        fn: "math.floor",
+        args: [{ kind: "bin", op: "/", left: value, right: two, type: F64, loc }],
+        type: F64,
+        loc,
+    });
+    const countRun = [
+        b.assign(scan, b.add(low, one)),
+        b.assign(runEnd, b.add(low, remaining)),
+        b.branch(b.eq(scan, runEnd), [b.assign(length, one)], [
+            b.assign(length, two),
+            b.assign(descending, less(at(src, scan), at(src, low))),
+            b.bind(previous, at(src, scan)),
+            b.step(scan),
+            b.while(b.lt(scan, runEnd), [
+                b.branch(b.choose(descending, b.not(less(at(src, scan), previous)), less(at(src, scan), previous)), [brk()]),
+                b.assign(previous, at(src, scan)),
+                b.step(length),
+                b.step(scan),
+            ]),
+            b.branch(descending, [
+                b.assign(left, low),
+                b.assign(right, b.sub(b.add(low, length), one)),
+                b.while(b.lt(left, right), [
+                    b.bind(vl, at(src, left)),
+                    b.bind(vr, at(src, right)),
+                    b.set(src, left, vr),
+                    b.set(src, right, vl),
+                    b.step(left),
+                    b.step(right, -1),
                 ]),
-                b.assign(runCount, nextRun),
-                b.bind(tmp, src),
-                b.assign(src, dst),
-                b.assign(dst, tmp),
             ]),
         ]),
     ];
+    const insertion = [
+        b.assign(forced, min(minRun, remaining)),
+        // [low, low + length) is sorted; insert each later element.
+        b.assign(pos, b.add(low, length)),
+        b.while(b.lt(pos, b.add(low, forced)), [
+            b.assign(left, low),
+            b.assign(right, pos),
+            b.bind(pivot, at(src, pos)),
+            b.while(b.lt(left, right), [
+                b.assign(mid, half(left, right)),
+                b.branch(less(pivot, at(src, mid)), [b.assign(right, mid)], [b.assign(left, b.add(mid, one))]),
+            ]),
+            ...copyBackward(left, b.add(left, one), b.sub(pos, left)),
+            b.set(src, left, pivot),
+            b.step(pos),
+        ]),
+        b.assign(length, forced),
+    ];
+    const collapse = b.while(b.lt(one, runs), [
+        b.assign(top, b.sub(runs, two)),
+        b.branch(or(b.not(invariant(b.add(top, one))), b.not(invariant(top))), [
+            b.branch(b.lt(at(runLen, b.sub(top, one)), at(runLen, b.add(top, one))), [b.step(top, -1)]),
+            ...mergeAt(top),
+        ], [b.branch(le(at(runLen, top), at(runLen, b.add(top, one))), [...mergeAt(top)], [brk()])]),
+    ]);
+    const forceCollapse = b.while(b.lt(one, runs), [
+        b.assign(top, b.sub(runs, two)),
+        b.branch(and(b.lt(zero, top), b.lt(at(runLen, b.sub(top, one)), at(runLen, b.add(top, one)))), [
+            b.step(top, -1),
+        ]),
+        ...mergeAt(top),
+    ]);
+    const scalars = [
+        cp,
+        gLast,
+        gOfs,
+        gMax,
+        gMid,
+        gTmp,
+        gBase,
+        gLength,
+        gHint,
+        baseA,
+        lenA,
+        baseB,
+        lenB,
+        dest,
+        cursorT,
+        cursorX,
+        winsA,
+        winsB,
+        k,
+        top,
+        low,
+        remaining,
+        minRun,
+        minRunOdd,
+        runEnd,
+        left,
+        right,
+        mid,
+        pos,
+        forced,
+        length,
+        scan,
+    ];
+    return [
+        ...scalars.map((local) => b.bind(local, zero)),
+        b.bind(firstPass, { kind: "boolLit", value: false, type: BOOL, loc }),
+        b.bind(descending, { kind: "boolLit", value: false, type: BOOL, loc }),
+        b.bind(minGallop, b.num(7)),
+        b.bind(runBase, { kind: "arrayLit", elems: [], type: runBase.type, loc }),
+        b.bind(runLen, { kind: "arrayLit", elems: [], type: runLen.type, loc }),
+        b.bind(runs, zero),
+        b.bind(minRun, n),
+        b.bind(minRunOdd, zero),
+        b.while(ge(minRun, b.num(64)), [
+            b.branch(b.not(b.eq(b.sub(minRun, b.add(half2(minRun), half2(minRun))), zero)), [
+                b.assign(minRunOdd, one),
+            ]),
+            b.assign(minRun, half2(minRun)),
+        ]),
+        b.assign(minRun, b.add(minRun, minRunOdd)),
+        b.bind(low, zero),
+        b.bind(remaining, n),
+        b.while(b.lt(zero, remaining), [
+            ...countRun,
+            b.branch(b.lt(length, minRun), insertion),
+            b.set(runBase, runs, low),
+            b.set(runLen, runs, length),
+            b.step(runs),
+            collapse,
+            b.assign(low, b.add(low, length)),
+            b.assign(remaining, b.sub(remaining, length)),
+        ]),
+        forceCollapse,
+    ];
 }
 /** Recognizes the lifted body of a capture-free numeric comparator:
  * `(a, b) => a - b`, `b - a`, `a < b ? -1 : a > b ? 1 : 0` (either test
@@ -321,6 +673,14 @@ export function recognizeKeyComparator(fn) {
     }
     return null;
 }
+/** The key order of a comparator closure: a zero-capture closure (not a
+ * signature adapter) over a lifted function recognizeKeyComparator accepts. */
+export function closureKeyOrder(liftedFns, closure) {
+    if (closure.kind !== "closure" || closure.captures.length > 0 || closure.adapts)
+        return null;
+    const fn = liftedFns.find((lifted) => lifted.name === closure.fnName);
+    return fn ? recognizeKeyComparator(fn) : null;
+}
 function sameKeyRead(left, right) {
     if (left === null || right === null)
         return left === right;
@@ -354,7 +714,7 @@ export function buildArraySortFn(name, elem, arity, copyFirst, undefinedTag, loc
     // receives the comparator for inputs whose keys it does not order.
     const keyArgs = keyed ? [b.num(keyed.order), ...(key ? [key] : [])] : [];
     const src = b.local("src", arrT);
-    const n = b.local("n"), valueCount = b.local("valueCount"), undefinedCount = b.local("undefinedCount");
+    const n = b.local("n"), valueCount = b.local("valueCount"), undefinedCount = b.local("undefinedCount"), undefinedValues = b.local("undefinedValues");
     const index = b.local("index"), state = b.local("state");
     const isUndefined = (value) => {
         if (elem.kind === "union" && undefinedTag !== null) {
@@ -370,20 +730,47 @@ export function buildArraySortFn(name, elem, arity, copyFirst, undefinedTag, loc
         }
         return null;
     };
-    const greater = (left, right) => {
-        const compare = {
-            kind: "bin",
-            op: ">",
-            left: { kind: "callValue", callee: f, args: [left, right].slice(0, arity), type: F64, loc },
-            right: b.num(0),
-            type: BOOL,
+    // A NaN result compares as 0, which `< 0` gives.
+    const less = (left, right) => ({
+        kind: "bin",
+        op: "<",
+        left: { kind: "callValue", callee: f, args: [left, right].slice(0, arity), type: F64, loc },
+        right: b.num(0),
+        type: BOOL,
+        loc,
+    });
+    const keepValue = () => [
+        b.branch(b.lt(valueCount, index), [b.set(src, valueCount, b.at(src, index))]),
+        b.step(valueCount),
+    ];
+    const compactValue = () => {
+        const undefinedValue = isUndefined(b.at(src, index));
+        return undefinedValue === null
+            ? { kind: "block", body: keepValue(), loc }
+            : b.branch(undefinedValue, [b.step(undefinedValues)], keepValue());
+    };
+    // The union's undefined value, for the elements that held one.
+    const undefinedValue = () => elem.kind === "union" && undefinedTag !== null
+        ? {
+            kind: "unionWrap",
+            unionId: elem.unionId,
+            tag: undefinedTag,
+            value: { kind: "unitLit", unit: "undefined", type: UNDEFINED_T, loc },
+            type: elem,
             loc,
-        };
-        const leftUndefined = isUndefined(left), rightUndefined = isUndefined(right);
-        return leftUndefined !== null && rightUndefined !== null
-            ? b.choose(leftUndefined, b.not(rightUndefined), b.choose(rightUndefined, { kind: "boolLit", value: false, type: BOOL, loc }, compare))
-            : compare;
+        }
+        : null;
+    const unionTail = () => {
+        const value = undefinedValue();
+        return value === null
+            ? []
+            : [
+                b.loop(index, valueCount, b.add(valueCount, undefinedValues), [
+                    b.set(result, index, value),
+                ]),
+            ];
     };
+    const tailStart = () => b.add(valueCount, undefinedValues);
     const result = copyFirst ? src : a;
     // Dense arrays sort in the runtime without the compacting snapshot below:
     // `sort` orders the receiver's values outside it and writes them back
@@ -403,14 +790,14 @@ export function buildArraySortFn(name, elem, arity, copyFirst, undefinedTag, loc
         ...(native && copyFirst ? [dense(src)] : []),
         b.bind(valueCount, b.num(0)),
         b.bind(undefinedCount, b.num(0)),
-        // Compact the owned snapshot before callbacks. Dense values stay in
-        // place; only values following holes or storage-level undefined move.
+        b.bind(undefinedValues, b.num(0)),
+        // Compact the owned snapshot before callbacks, as V8 does: holes are
+        // dropped, undefined values (storage-level, or a union's undefined arm)
+        // are counted, and the comparator only sees the other values. Dense
+        // values stay in place; only values following the others move.
         b.loop(index, b.num(0), n, [
             b.bind(state, { kind: "arrayState", arr: src, index, type: F64, loc }),
-            b.branch(b.eq(state, b.num(1)), [
-                b.branch(b.lt(valueCount, index), [b.set(src, valueCount, b.at(src, index))]),
-                b.step(valueCount),
-            ], [b.branch(b.eq(state, b.num(2)), [b.step(undefinedCount)])]),
+            b.branch(b.eq(state, b.num(1)), [compactValue()], [b.branch(b.eq(state, b.num(2)), [b.step(undefinedCount)])]),
         ]),
         // Sort only the compacted prefix. The tail is overwritten with undefined
         // for toSorted, or released with this private snapshot for sort.
@@ -431,17 +818,18 @@ export function buildArraySortFn(name, elem, arity, copyFirst, undefinedTag, loc
                     loc,
                 },
             ]
-            : stableSort(b, src, valueCount, greater)),
+            : timSort(b, src, valueCount, less)),
         ...(copyFirst
             ? []
             : [b.loop(index, b.num(0), valueCount, [b.set(a, index, b.at(src, index))])]),
-        b.loop(index, valueCount, copyFirst ? n : b.add(valueCount, undefinedCount), [
+        ...unionTail(),
+        b.loop(index, tailStart(), copyFirst ? n : b.add(tailStart(), undefinedCount), [
             { kind: "arraySetUndefined", arr: result, index, loc },
         ]),
         ...(copyFirst
             ? []
             : [
-                b.loop(index, b.add(valueCount, undefinedCount), n, [
+                b.loop(index, b.add(tailStart(), undefinedCount), n, [
                     { kind: "arrayDelete", arr: a, index, loc },
                 ]),
             ]),
@@ -460,62 +848,44 @@ export function buildArraySortFn(name, elem, arity, copyFirst, undefinedTag, loc
         loc,
     };
 }
-/** A byte's complete value domain is small enough for stable default ordering
- * without comparisons. Counts use numbers so large inputs cannot wrap. */
-function countBytes(b, a, src, n) {
-    const counts = b.local("counts", arrayOf(F64));
-    const value = b.local("value"), index = b.local("index"), end = b.local("end");
-    const zero = b.num(0), one = b.num(1);
-    return [
-        b.bind(src, b.allocate(BYTES_U8, n)),
-        b.bind(counts, b.allocate(counts.type, b.num(256))),
-        b.loop(value, zero, b.num(256), [b.set(counts, value, zero)]),
-        b.loop(index, zero, n, [
-            b.bind(value, b.at(a, index)),
-            b.set(counts, value, b.add(b.at(counts, value), one)),
-        ]),
-        b.bind(index, zero),
-        b.loop(value, zero, b.num(256), [
-            b.bind(end, b.add(index, b.at(counts, value))),
-            b.while(b.lt(index, end), [b.set(src, index, value), b.step(index)]),
-        ]),
-    ];
-}
-export function buildBytesSortFn(name, arity, hasComparator, loc) {
+/** Typed-array `sort` and `toSorted`. `toSorted` orders a private copy;
+ * `sort` orders the receiver and returns it. Without a comparator, and for a
+ * recognized numeric comparator's `order`, the runtime sorts the elements by
+ * value (sortNumeric). Other comparators, and a recognized one the runtime
+ * refuses (a NaN or -0 element), take the runtime comparator sort
+ * (sortCompare). */
+export function buildBytesSortFn(name, type, arity, hasComparator, copyFirst, order, loc) {
     const b = new SortIr(loc);
-    const a = b.local("a", BYTES_U8), src = b.local("src", BYTES_U8), n = b.local("n");
+    const a = b.local("a", type), src = b.local("src", type);
     const fnT = funcOf([F64, F64].slice(0, arity), F64);
     const f = hasComparator ? b.local("f", fnT) : null;
-    const body = [b.bind(n, b.length(a))];
-    if (f !== null) {
-        body.push(b.bind(src, {
-            kind: "bytesIntrinsic",
-            method: "slice",
-            receiver: a,
-            args: [],
-            type: BYTES_U8,
-            loc,
-        }));
-        body.push(...stableSort(b, src, n, (left, right) => ({
-            kind: "bin",
-            op: ">",
-            left: { kind: "callValue", callee: f, args: [left, right].slice(0, arity), type: F64, loc },
-            right: b.num(0),
-            type: BOOL,
-            loc,
-        })));
-    }
-    else {
-        body.push(...countBytes(b, a, src, n));
-    }
-    body.push({ kind: "return", value: src, loc });
+    const target = copyFirst ? src : a;
+    const intrinsic = (method, arg) => ({
+        kind: "bytesIntrinsic",
+        method,
+        receiver: target,
+        args: [arg],
+        type: method === "sortNumeric" ? BOOL : VOID,
+        loc,
+    });
+    const body = copyFirst
+        ? [b.bind(src, { kind: "bytesIntrinsic", method: "slice", receiver: a, args: [], type, loc })]
+        : [];
+    const compare = f === null ? [] : [{ kind: "exprStmt", expr: intrinsic("sortCompare", f), loc }];
+    if (f === null)
+        body.push({ kind: "exprStmt", expr: intrinsic("sortNumeric", b.num(0)), loc });
+    else if (order === null)
+        body.push(...compare);
+    else
+        body.push(b.branch(b.not(intrinsic("sortNumeric", b.num(order))), compare));
+    body.push({ kind: "return", value: target, loc });
     return {
         name,
         params: [
-            { localId: a.localId, name: "a", type: BYTES_U8 },
+            { localId: a.localId, name: "a", type },
             ...(f === null ? [] : [{ localId: f.localId, name: "f", type: fnT }]),
         ],
-        returnType: BYTES_U8,
+        returnType: type,
         locals: b.locals,
         body: distinctNodes(body),
         loc,