@scriptc/compiler 0.3.0 → 0.3.2

package/dist/frontend/lowering/devirtualize.js

@@ -0,0 +1,199 @@
+import * as ts from "../ts7/adapter.js";
+import { everyStmtList, transformStmtList } from "../../ir/traverse.js";
+/** Post-reachability devirtualization. A `virtualCall` on static class C
+ * becomes a direct call when exactly one implementation can run:
+ *
+ * - no override of the nearest declaration is reachable below C (the
+ *   original rule), or
+ * - every class in C's subtree that may be instantiated EXACTLY resolves
+ *   the method to the same declaration. Classes reached only through a
+ *   subclass's super() never carry their own vtable, so an abstract base
+ *   with one implementation, or a concrete base that is never itself
+ *   constructed, dispatches to its single constructed implementation.
+ *
+ * Instantiation is conservative: any constructor edge other than super()
+ * counts (`new`, class values, dynamic and library construction), as does
+ * every class some retained IR allocates (`new`) or exposes as a class
+ * value (its whole subtree: a construct thunk exists for it). Those are
+ * the only native allocation paths; runtime-provided classes always
+ * count. Subtrees whose classes the compiler cannot see completely
+ * (decorated classes, dynamic bases, exported library classes) stay
+ * virtual. Methods replaceable at runtime never reach this pass: their
+ * calls take the checked property path instead of a virtualCall. */
+export function devirtualizeVirtualCalls(lowerer, functions, facts) {
+    const sites = new ConstructedClasses(lowerer, functions, facts);
+    for (const fn of functions)
+        fn.body = transformStmtList(fn.body, {
+            stmt: (statement) => statement,
+            expr: (expression) => expression.kind === "virtualCall" ? sites.devirtualize(expression) : expression,
+        });
+}
+class ConstructedClasses {
+    lowerer;
+    facts;
+    lowered = new Set();
+    /** Classes some retained IR allocates or exposes as a class value. */
+    allocated = new Set();
+    exportedNames;
+    openMemo = new Map();
+    subtreeMemo = new Map();
+    constructor(lowerer, functions, facts) {
+        this.lowerer = lowerer;
+        this.facts = facts;
+        const subtree = (name) => {
+            this.allocated.add(name);
+            const info = lowerer.classes.get(name);
+            if (info)
+                for (const c of this.descendants(info))
+                    this.allocated.add(c.def.name);
+        };
+        for (const fn of functions) {
+            this.lowered.add(fn.name);
+            everyStmtList(fn.body, {
+                stmt: () => true,
+                expr: (e) => {
+                    if (e.kind === "new")
+                        this.allocated.add(e.className);
+                    else if (e.kind === "classRef")
+                        subtree(e.className);
+                    else if (e.kind === "newValue" && e.callee.type.kind === "classval")
+                        subtree(e.callee.type.className);
+                    return true;
+                },
+            });
+        }
+        this.exportedNames = facts.library ? exportedNames(facts.files) : new Set();
+    }
+    devirtualize(e) {
+        const lowerer = this.lowerer;
+        const info = lowerer.classes.get(e.className);
+        const nearest = info && lowerer.findMethodOn(info, e.method);
+        if (!info || !nearest)
+            return e;
+        if (nearest.sig.abstract !== true &&
+            !this.descendants(info).some((candidate) => candidate !== info &&
+                candidate.methods.has(e.method) &&
+                this.facts.reachable.has(`%${candidate.def.name}.${e.method}`)))
+            return this.direct(e, info, nearest.declarer);
+        if (this.open(info))
+            return e;
+        let target = null;
+        for (const candidate of this.descendants(info)) {
+            if (!this.mayInstantiate(candidate))
+                continue;
+            const found = lowerer.findMethodOn(candidate, e.method);
+            if (!found || found.sig.abstract === true)
+                return e;
+            if (target !== null && target !== found.declarer)
+                return e;
+            target = found.declarer;
+        }
+        if (target === null || runtimeProvided(target))
+            return e;
+        const callee = `%${target.def.name}.${e.method}`;
+        if (!this.facts.reachable.has(callee) || !this.lowered.has(callee))
+            return e;
+        return this.direct(e, info, target);
+    }
+    direct(e, info, target) {
+        const receiver = e.args[0];
+        const typed = target === info || this.lowerer.isSubclassOf(info.def.name, target.def.name)
+            ? this.lowerer.upcastTo(receiver, target.def.name)
+            : // Every instance that can reach this site is a `target`: the
+                // reinterpret is proven by the instantiation set, like a
+                // checker-narrowed downcast.
+                {
+                    kind: "downcast",
+                    value: receiver,
+                    type: { kind: "object", className: target.def.name },
+                    loc: receiver.loc,
+                };
+        return {
+            kind: "call",
+            callee: `%${target.def.name}.${e.method}`,
+            args: [typed, ...e.args.slice(1)],
+            type: e.type,
+            loc: e.loc,
+        };
+    }
+    /** The class and every class below it, in the isSubclassOf sense
+     * (generic instances included). */
+    descendants(info) {
+        let out = this.subtreeMemo.get(info);
+        if (out === undefined) {
+            out = [info];
+            for (const candidate of this.lowerer.classes.values())
+                if (this.lowerer.isSubclassOf(candidate.def.name, info.def.name))
+                    out.push(candidate);
+            this.subtreeMemo.set(info, out);
+        }
+        return out;
+    }
+    mayInstantiate(info) {
+        return (this.facts.instantiated.has(info.def.name) ||
+            this.allocated.has(info.def.name) ||
+            runtimeProvided(info));
+    }
+    /** True when C's subtree may hold instances the compiler cannot
+     * enumerate: a decorator can replace a class, a dynamic base can change
+     * the chain, and a library host can construct exported classes. */
+    open(info) {
+        const memo = this.openMemo.get(info);
+        if (memo !== undefined)
+            return memo;
+        const open = this.descendants(info).some((c) => c.classDecorators !== undefined ||
+            c.callableBase !== undefined ||
+            c.factoryBaseExpression !== undefined ||
+            c.localClass?.baseExpression !== undefined ||
+            (this.facts.library && this.exported(c)));
+        this.openMemo.set(info, open);
+        return open;
+    }
+    exported(info) {
+        const decl = info.decl;
+        if (!decl)
+            return false;
+        if ((ts.getCombinedModifierFlags(decl) & ts.ModifierFlags.Export) !== 0)
+            return true;
+        const name = decl.name?.text ??
+            (ts.isVariableDeclaration(decl.parent) && ts.isIdentifier(decl.parent.name)
+                ? decl.parent.name.text
+                : undefined);
+        if (name === undefined)
+            return false;
+        if (ts.isVariableDeclaration(decl.parent)) {
+            const statement = decl.parent.parent?.parent;
+            if (statement !== undefined &&
+                ts.isVariableStatement(statement) &&
+                (ts.getCombinedModifierFlags(statement) & ts.ModifierFlags.Export) !== 0)
+                return true;
+        }
+        return this.exportedNames.has(name);
+    }
+}
+function runtimeProvided(info) {
+    return (info.decl === null ||
+        info.builtinError === true ||
+        info.builtinEmitter === true ||
+        info.builtinStream !== undefined);
+}
+/** Local names a module exports through `export { ... }` or
+ * `export default name` (declarations carry their own modifier). */
+function exportedNames(files) {
+    const names = new Set();
+    for (const sf of files)
+        for (const statement of sf.statements) {
+            if (ts.isExportDeclaration(statement) &&
+                statement.moduleSpecifier === undefined &&
+                statement.exportClause &&
+                ts.isNamedExports(statement.exportClause)) {
+                for (const element of statement.exportClause.elements)
+                    names.add((element.propertyName ?? element.name).text);
+            }
+            else if (ts.isExportAssignment(statement) && ts.isIdentifier(statement.expression)) {
+                names.add(statement.expression.text);
+            }
+        }
+    return names;
+}
+//# sourceMappingURL=devirtualize.js.map

package/dist/frontend/lowering/devirtualize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"devirtualize.js","sourceRoot":"","sources":["../../../src/frontend/lowering/devirtualize.ts"],"names":[],"mappings":"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"}

package/dist/frontend/lowering/expressions/nullish-assignment.js

@@ -1,11 +1,20 @@
 import * as ts from "../../ts7/adapter.js";
-import { DYN, STRING, VOID, isUnitType, } from "../../../ir/ir.js";
+import { BOOL, DYN, F64, STRING, VOID, isUnitType, typeEquals, } from "../../../ir/ir.js";
 import { varRef } from "../../../ir/build.js";
 import { locOf } from "../../program.js";
-import { arrayValueRead, arrayValueStore } from "../array-values.js";
+import { arrayNumberRead, arrayValueRead, arrayValueStore } from "../array-values.js";
 import { fenceNodeModuleMutation } from "../lower-node-module.js";
 import { globalSymbolKey } from "./global-symbols.js";
 import { tryLowerExpression } from "./try-lower-expression.js";
+/** Element kinds whose present values are never null or undefined. */
+const NON_NULLISH_ELEMENTS = new Set([
+    "f64",
+    "string",
+    "bool",
+    "bigint",
+    "object",
+    "array",
+]);
 /** The reference and its read evaluate once; the write exists only in the
  * selected branch. In particular an accessor setter never runs for a kept value. */
 export function lowerShortCircuitAssignment(lowerer, expr) {
@@ -18,11 +27,16 @@ export function lowerShortCircuitAssignment(lowerer, expr) {
         prefix.push({ kind: "varDecl", localId: local.id, init: value, loc: value.loc });
         return varRef(local.id, value.type, value.loc);
     };
+    const finish = (result) => prefix.length === 0
+        ? result
+        : { kind: "seqExpr", stmts: prefix, result, type: result.type, loc };
     let target = expr.left;
     while (ts.isParenthesizedExpression(target))
         target = target.expression;
     let read;
     let storage;
+    // The right side, when an element fast path already lowered it.
+    let rhs = null;
     let write;
     if (ts.isIdentifier(target)) {
         const binding = lowerer.resolveWritable(target);
@@ -129,9 +143,46 @@ export function lowerShortCircuitAssignment(lowerer, expr) {
             else if (receiver.type.kind === "array" && key.type.kind === "f64") {
                 key = save(key, "%shortCircuitKey");
                 storage = receiver.type.elem;
-                read = arrayValueRead(lowerer, receiver, key, storage, locOf(target));
                 const element = storage;
                 write = (value) => arrayValueStore(lowerer, receiver, key, value, element, loc);
+                const elementLoc = locOf(target);
+                if (nullish && NON_NULLISH_ELEMENTS.has(element.kind)) {
+                    // Only a missing element is nullish: keep the present value or
+                    // store the right side, without the optional element value.
+                    rhs = lowerer.lowerExprExpecting(expr.right, element);
+                    if (typeEquals(rhs.type, element)) {
+                        const assigned = lowerer.declareHiddenLocal("%shortCircuitValue", element);
+                        const ref = varRef(assigned.id, element, loc);
+                        const present = {
+                            kind: "bin",
+                            op: "===",
+                            left: { kind: "arrayState", arr: receiver, index: key, type: F64, loc: elementLoc },
+                            right: { kind: "numLit", value: 1, type: F64, loc: elementLoc },
+                            type: BOOL,
+                            loc: elementLoc,
+                        };
+                        return finish({
+                            kind: "ternary",
+                            cond: present,
+                            then: { kind: "arrayGet", arr: receiver, index: key, type: element, loc: elementLoc },
+                            else_: {
+                                kind: "seqExpr",
+                                stmts: [{ kind: "varDecl", localId: assigned.id, init: rhs, loc }, write(ref)],
+                                result: ref,
+                                type: element,
+                                loc,
+                            },
+                            type: element,
+                            loc,
+                        });
+                    }
+                }
+                // `||=` keeps only a truthy number, which is always present; NaN is
+                // falsy exactly like the undefined of a missing element.
+                read =
+                    !nullish && !and && element.kind === "f64"
+                        ? arrayNumberRead(receiver, key, elementLoc)
+                        : arrayValueRead(lowerer, receiver, key, element, elementLoc);
             }
             else {
                 lowerer.unsupported("SC1090", target, "short-circuit assignment through this indexed receiver");
@@ -141,16 +192,13 @@ export function lowerShortCircuitAssignment(lowerer, expr) {
     else {
         lowerer.unsupported("SC1090", target, "short-circuit assignment to this reference");
     }
-    const finish = (result) => prefix.length === 0
-        ? result
-        : { kind: "seqExpr", stmts: prefix, result, type: result.type, loc };
     if (nullish &&
         !isUnitType(read.type) &&
         read.type.kind !== "dyn" &&
         (read.type.kind !== "union" || !lowerer.unions.get(read.type.unionId)?.arms.some(isUnitType))) {
         return finish(read);
     }
-    const value = lowerer.lowerExprExpecting(expr.right, storage);
+    const value = rhs ?? lowerer.lowerExprExpecting(expr.right, storage);
     const assigned = lowerer.declareHiddenLocal("%shortCircuitValue", value.type);
     const ref = varRef(assigned.id, value.type, loc);
     const result = lowerer.coerceInto(expr.right, ref, read.type);

package/dist/frontend/lowering/expressions/nullish-assignment.js.map

@@ -1 +1 @@
-{"version":3,"file":"nullish-assignment.js","sourceRoot":"","sources":["../../../../src/frontend/lowering/expressions/nullish-assignment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nullish-assignment.js","sourceRoot":"","sources":["../../../../src/frontend/lowering/expressions/nullish-assignment.ts"],"names":[],"mappings":"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"}

package/dist/frontend/lowering/expressions/object-literals.js

@@ -21,30 +21,6 @@ import { runtimeOptionalStorageOperand } from "../lower-exprs.js";
  * smuggle a wider/narrower literal past tsc's freshness check), which the
  * exact-shape checks below reject with SC2002. Fields lower IN SOURCE
  * ORDER: JS evaluates property values in source order. */
-/** The dropped-field names of the PromiseSettledResult honest subset
- * (SEMANTICS.md 46): when the literal's target type is (a union
- * containing) the lib's PromiseFulfilledResult / PromiseRejectedResult,
- * the record mapping kept only `status` — `value` and `reason` evaluate
- * for effect and are not stored. Null for every other target. */
-function settledDropNames(lowerer, tsType) {
-    let names = null;
-    const parts = tsType.isUnionType() ? ts.constituentTypes(tsType) : [tsType];
-    for (const part of parts) {
-        const sym = part.getSymbol();
-        if (!sym ||
-            !lowerer.checker
-                .declarationsOf(sym)
-                .some((d) => ts.isInterfaceDeclaration(d) && lowerer.isStdlibFile(d.getSourceFile()))) {
-            continue;
-        }
-        if (sym.name === "PromiseFulfilledResult" || sym.name === "PromiseRejectedResult") {
-            if (names === null)
-                names = new Set();
-            names.add(sym.name === "PromiseFulfilledResult" ? "value" : "reason");
-        }
-    }
-    return names;
-}
 /** `{ [KEY]: v }` where KEY is a compile-time-known string or number:
  * the key folds into an ordinary (spelled) property name — the record
  * shape is exactly what tsc computed for the literal (the late-bound
@@ -1408,11 +1384,6 @@ export function lowerObjectLiteral(lowerer, expr, expected) {
         if (hasSpread) {
             for (let i = 0; i < fields.length; i++) {
                 const field = fields[i];
-                if (field.drop) {
-                    spreadStmts.push({ kind: "exprStmt", expr: field.value, loc: field.value.loc });
-                    fields.splice(i--, 1);
-                    continue;
-                }
                 field.value = captureField(field.value);
             }
         }
@@ -1675,7 +1646,7 @@ export function lowerObjectLiteral(lowerer, expr, expected) {
                         if (canBeAbsent)
                             cond = fieldPresent();
                     }
-                    const at = fields.findIndex((x) => x.name === f.name && !x.drop);
+                    const at = fields.findIndex((x) => x.name === f.name);
                     const elseVal = at >= 0 ? fields[at].value : lowerer.absentFieldValue(targetType, locOf(prop));
                     if (!elseVal) {
                         lowerer.unsupported("SC1090", prop, `object spread of '${lowerer.fmt(srcType)}' sources where '${f.name}' has no earlier contributor (the absent arm leaves the required field unset — spread defaults first: { ...defaults, ...overrides })`);
@@ -1887,10 +1858,7 @@ export function lowerObjectLiteral(lowerer, expr, expected) {
         let fieldType = fieldTypes.get(name);
         // An undeclared name against an index-signature shape is an OVERFLOW
         // entry (tsc typechecked it against the signature's value type);
-        // against a plain shape it is the width mismatch it always was —
-        // EXCEPT the PromiseSettledResult honest subset's dropped fields
-        // (value/reason — SEMANTICS.md 46): those evaluate for effect in
-        // their source-order slot and store nothing.
+        // against a plain shape it is the width mismatch it always was.
         // A GENERIC-callable member (a generic method `m<T>(x: T) {...}` or a
         // generic arrow/function-expression property): excluded from the
         // record shape (isGenericCallableMemberType — no single closure slot
@@ -1921,28 +1889,6 @@ export function lowerObjectLiteral(lowerer, expr, expected) {
             }
         }
         if (!fieldType && !shape.indexValue) {
-            if (settledDropNames(lowerer, tsType)?.has(name)) {
-                // Identifier and shorthand initializers are effect-free reads —
-                // skipped outright. The caught `reason` MUST skip: lowering the
-                // read would hit the catch-binding narrowness fence, and the
-                // snapshot it names needs no evaluation.
-                if (ts.isPropertyAssignment(prop) && !ts.isIdentifier(prop.initializer)) {
-                    const v = lowerer.lowerExpr(prop.initializer);
-                    // Effect-free lowerings (literals, plain reads) drop at
-                    // compile time; anything else — the awaited mapper — runs
-                    // (and may throw into the enclosing catch) with its result
-                    // released by the statement frame.
-                    if (v.kind !== "unitLit" &&
-                        v.kind !== "numLit" &&
-                        v.kind !== "strLit" &&
-                        v.kind !== "boolLit" &&
-                        v.kind !== "varRef" &&
-                        v.kind !== "closure") {
-                        fields.push({ name, value: v, drop: true });
-                    }
-                }
-                continue;
-            }
             shapeMismatch(prop);
         }
         let value;
@@ -2657,6 +2603,9 @@ export function lowerShorthandValue(lowerer, prop) {
         if (stored)
             return stored;
         const local = lowerer.resolveKey(symbol, propName);
+        // A catch binding reads like the long form `{ reason: reason }`.
+        if (local?.type.kind === "caught")
+            return lowerer.caughtRead(propName, local, loc);
         if (local) {
             return lowerer.maybeNarrow({ kind: "varRef", localId: local.id, type: local.type, loc }, propName);
         }