@scriptc/compiler 0.0.34 → 0.0.36

package/dist/backend/llvm/dyn.js

@@ -1,17 +1,19 @@
-import { DYN_HANDLE_KINDS, isRefCounted, typeKey } from "../../ir/nodes.js";
+import { InternalCompilerError } from "../../errors.js";
+import { DYN_HANDLE_KINDS, isRefCounted, typeKey } from "../../ir/ir.js";
+import { dynDesc, undefinedArmTag } from "../../ir/analysis.js";
 import { mangleRecordNew, mangleRecordStruct } from "../mangle.js";
 import { BlockBuilder } from "./blocks.js";
 import { arrNewCall, elemAccess, llFieldType, releaseSym, traceAdapter, traceArg, vAdapters } from "./shapes.js";
 import { LlvmUnsupportedError } from "./unsupported.js";
 /** ScrDynKind values (scr_runtime.h). */
 /** ScrDynHandleTag numeric values (scr_runtime.h's enum order). */
-export const DYN_HANDLE_TAG_NUM = {
+const DYN_HANDLE_TAG_NUM = {
     httpReq: 0,
     httpRes: 1,
     netSocket: 2,
     netServer: 3,
 };
-export const DK = {
+export const DYN_KIND = {
     NULL: 0,
     BOOL: 1,
     NUM: 2,
@@ -237,47 +239,7 @@ export class LlDyn {
         B.terminate(`ret ${dummy}`);
         B.startBlock(lk);
     }
-    /* ── dynDesc (ported verbatim — pure strings) ──────────────────────── */
-    /** Short human description of a dynCheck target for error messages. */
-    dynDesc(t) {
-        switch (t.kind) {
-            case "f64":
-                return "number";
-            case "string":
-                return "string";
-            case "bool":
-                return "boolean";
-            case "record":
-                return this.host.recordsById.get(t.shapeId)?.tuple ? "array" : "object";
-            case "array":
-                return "array";
-            case "nullT":
-                return "null";
-            case "undefinedT":
-                return "undefined";
-            case "dyn":
-                return "unknown";
-            case "bytes":
-                return "Uint8Array";
-            case "object":
-                return t.className.replace(/^%/, "");
-            case "union": {
-                const def = this.host.unionsById.get(t.unionId);
-                if (!def)
-                    throw new Error(`llvm emitter bug: dynDesc of unknown union ${t.unionId}`);
-                return def.arms.map((a) => this.dynDesc(a)).join(" | ");
-            }
-            case "func":
-                return "function";
-            default: {
-                const h = DYN_HANDLE_KINDS.get(t.kind);
-                if (h)
-                    return h.cls;
-                throw new Error(`llvm emitter bug: dynDesc of non-JSON type ${t.kind}`);
-            }
-        }
-    }
-    /* ── dynMatchHelper (emit-walkers.ts, ported) ──────────────────────── */
+    /* ── dynMatchHelper (walkers.ts, ported) ──────────────────────── */
     /** `sc_dm_<n>(ptr d) -> i1` — does this dyn fit T? Never throws. */
     dynMatchHelper(t) {
         const key = typeKey(t);
@@ -303,7 +265,7 @@ export class LlDyn {
             this.host.declare(`declare void @scr_dyn_release_v(ptr)`);
             const kind = this.kindOf(B, "%d");
             const capsule = B.tmp();
-            B.line(`${capsule} = icmp eq i32 ${kind}, ${DK.TYPED_REF}`);
+            B.line(`${capsule} = icmp eq i32 ${kind}, ${DYN_KIND.TYPED_REF}`);
             const lCapsule = B.newLabel("dm.tr.mat");
             const lPlain = B.newLabel("dm.tr.plain");
             B.condBr(capsule, lCapsule, lPlain);
@@ -324,19 +286,19 @@ export class LlDyn {
         };
         switch (t.kind) {
             case "f64":
-                kindIs(DK.NUM);
+                kindIs(DYN_KIND.NUM);
                 break;
             case "string":
-                kindIs(DK.STR);
+                kindIs(DYN_KIND.STR);
                 break;
             case "bool":
-                kindIs(DK.BOOL);
+                kindIs(DYN_KIND.BOOL);
                 break;
             case "nullT":
-                kindIs(DK.NULL);
+                kindIs(DYN_KIND.NULL);
                 break;
             case "undefinedT":
-                kindIs(DK.UNDEF);
+                kindIs(DYN_KIND.UNDEF);
                 break;
             case "dyn":
                 // An `unknown` target: every dyn value fits, undefined included.
@@ -344,20 +306,20 @@ export class LlDyn {
                 break;
             case "bytes":
                 if (t.elem !== "u8")
-                    throw new Error(`llvm emitter bug: dynMatch of bytes<${t.elem}>`);
-                kindIs(DK.BYTES);
+                    throw new InternalCompilerError(`llvm emitter bug: dynMatch of bytes<${t.elem}>`);
+                kindIs(DYN_KIND.BYTES);
                 break;
             case "record": {
                 const shape = this.host.recordsById.get(t.shapeId);
                 if (!shape)
-                    throw new Error(`llvm emitter bug: dynCheck of unknown shape ${t.shapeId}`);
+                    throw new InternalCompilerError(`llvm emitter bug: dynCheck of unknown shape ${t.shapeId}`);
                 const fail = B.newLabel("dm.f");
                 const kd = this.kindOf(B, "%d");
                 // A tuple matches a JSON ARRAY of EXACTLY its arity, positionally.
                 if (shape.tuple) {
                     const byIndex = [...shape.fields].sort((a, b) => Number(a.name) - Number(b.name));
                     const isArr = B.tmp();
-                    B.line(`${isArr} = icmp eq i32 ${kd}, ${DK.ARR}`);
+                    B.line(`${isArr} = icmp eq i32 ${kd}, ${DYN_KIND.ARR}`);
                     const l1 = B.newLabel("dm.a");
                     B.condBr(isArr, l1, fail);
                     B.startBlock(l1);
@@ -382,7 +344,7 @@ export class LlDyn {
                     break;
                 }
                 const isObj = B.tmp();
-                B.line(`${isObj} = icmp eq i32 ${kd}, ${DK.OBJ}`);
+                B.line(`${isObj} = icmp eq i32 ${kd}, ${DYN_KIND.OBJ}`);
                 const l0 = B.newLabel("dm.o");
                 B.condBr(isObj, l0, fail);
                 B.startBlock(l0);
@@ -395,7 +357,7 @@ export class LlDyn {
                     B.line(`${has} = icmp ne ptr ${m}, null`);
                     const lTest = B.newLabel("dm.t");
                     const lNext = B.newLabel("dm.n");
-                    if (this.host.undefinedArmTag(f.type) >= 0) {
+                    if (undefinedArmTag(f.type, this.host.unionsById) >= 0) {
                         // Optional-flavored field: a MISSING key is the undefined arm
                         // (a match); a PRESENT key must fit the union as usual.
                         B.condBr(has, lTest, lNext);
@@ -456,7 +418,7 @@ export class LlDyn {
                 const fail = B.newLabel("dm.f");
                 const kd = this.kindOf(B, "%d");
                 const isArr = B.tmp();
-                B.line(`${isArr} = icmp eq i32 ${kd}, ${DK.ARR}`);
+                B.line(`${isArr} = icmp eq i32 ${kd}, ${DYN_KIND.ARR}`);
                 const l0 = B.newLabel("dm.a");
                 B.condBr(isArr, l0, fail);
                 B.startBlock(l0);
@@ -478,7 +440,7 @@ export class LlDyn {
             case "union": {
                 const def = this.host.unionsById.get(t.unionId);
                 if (!def)
-                    throw new Error(`llvm emitter bug: dynCheck of unknown union ${t.unionId}`);
+                    throw new InternalCompilerError(`llvm emitter bug: dynCheck of unknown union ${t.unionId}`);
                 // Arms in canonical order; any full match answers true.
                 const yes = B.newLabel("dm.y");
                 for (const arm of def.arms) {
@@ -499,7 +461,7 @@ export class LlDyn {
         this.defs.push(`define internal zeroext i1 @${name}(ptr %d) ${FN_ATTRS} { ; matches ${key}`, B.render(), `}`, ``);
         return name;
     }
-    /* ── dynCheckHelper (emit-walkers.ts, ported) ──────────────────────── */
+    /* ── dynCheckHelper (walkers.ts, ported) ──────────────────────── */
     /** `sc_dc_<n>(ptr d, ptr path) -> T` — validate the checked-dynamic tree against T and
      * BUILD the typed value (+1), or throw the catchable path-annotated
      * TypeError and return a dummy with the pending flag set. */
@@ -514,7 +476,7 @@ export class LlDyn {
         const retTy = this.valTy(t);
         const dummy = retTy === "double" ? `double ${f64Lit(0)}` : retTy === "i1" ? "i1 false" : "ptr null";
         host.declare(`declare void @scr_dyn_check_fail(ptr, ptr, ptr)`);
-        const want = host.cstr(this.dynDesc(t));
+        const want = host.cstr(dynDesc(t, this.host.recordsById, this.host.unionsById));
         const B = new BlockBuilder();
         if (isRefCounted(t) && t.kind !== "dyn") {
             host.declare(`declare zeroext i1 @scr_dyn_typed_ref_is(ptr, ptr, ${host.sizeType})`);
@@ -537,7 +499,7 @@ export class LlDyn {
                 const rc = vAdapters(host, t);
                 const kind = this.kindOf(B, "%d");
                 const capsule = B.tmp();
-                B.line(`${capsule} = icmp eq i32 ${kind}, ${DK.TYPED_REF}`);
+                B.line(`${capsule} = icmp eq i32 ${kind}, ${DYN_KIND.TYPED_REF}`);
                 const lCapsule = B.newLabel("dc.tr.cap");
                 const lPlain = B.newLabel("dc.tr.plain");
                 B.condBr(capsule, lCapsule, lPlain);
@@ -566,7 +528,7 @@ export class LlDyn {
                         ? host.recordsById.get(t.shapeId)
                         : undefined;
                     if (t.kind === "record" && !shape) {
-                        throw new Error(`llvm emitter bug: cached typed-ref cast of unknown shape ${t.shapeId}`);
+                        throw new InternalCompilerError(`llvm emitter bug: cached typed-ref cast of unknown shape ${t.shapeId}`);
                     }
                     const lOk = B.newLabel("dc.tr.ok");
                     const lBad = B.newLabel("dc.tr.bad");
@@ -654,19 +616,19 @@ export class LlDyn {
         };
         switch (t.kind) {
             case "f64": {
-                requireKind(DK.NUM, "dc");
+                requireKind(DYN_KIND.NUM, "dc");
                 const v = this.payloadOf(B, "%d", "double");
                 B.terminate(`ret double ${v}`);
                 break;
             }
             case "bool": {
-                requireKind(DK.BOOL, "dc");
+                requireKind(DYN_KIND.BOOL, "dc");
                 const v = this.boolOf(B, "%d");
                 B.terminate(`ret i1 ${v}`);
                 break;
             }
             case "string": {
-                requireKind(DK.STR, "dc");
+                requireKind(DYN_KIND.STR, "dc");
                 host.declare(`declare ptr @scr_str_retain_v(ptr)`);
                 const s = this.payloadOf(B, "%d", "ptr");
                 const r = B.tmp();
@@ -685,8 +647,8 @@ export class LlDyn {
             case "bytes": {
                 // `u as Uint8Array`: kind check, then a fresh COPY out.
                 if (t.elem !== "u8")
-                    throw new Error(`llvm emitter bug: dynCheck of bytes<${t.elem}>`);
-                requireKind(DK.BYTES, "dc");
+                    throw new InternalCompilerError(`llvm emitter bug: dynCheck of bytes<${t.elem}>`);
+                requireKind(DYN_KIND.BYTES, "dc");
                 host.declare(`declare ptr @scr_dyn_bytes_copy_out(ptr)`);
                 const r = B.tmp();
                 B.line(`${r} = call ptr @scr_dyn_bytes_copy_out(ptr %d)`);
@@ -703,11 +665,11 @@ export class LlDyn {
                 // %error objects rebuild once and cache the pair. The C walker's
                 // arm exactly.
                 if (t.className !== "%Error") {
-                    throw new Error(`llvm emitter bug: dynCheck of class ${t.className} (only %Error extracts from the checked-dynamic tree)`);
+                    throw new InternalCompilerError(`llvm emitter bug: dynCheck of class ${t.className} (only %Error extracts from the checked-dynamic tree)`);
                 }
                 const kd = this.kindOf(B, "%d");
                 const isObj = B.tmp();
-                B.line(`${isObj} = icmp eq i32 ${kd}, ${DK.OBJ}`);
+                B.line(`${isObj} = icmp eq i32 ${kd}, ${DYN_KIND.OBJ}`);
                 const lObj = B.newLabel("dce.o");
                 const lFail = B.newLabel("dce.f");
                 B.condBr(isObj, lObj, lFail);
@@ -730,7 +692,7 @@ export class LlDyn {
             case "record": {
                 const shape = host.recordsById.get(t.shapeId);
                 if (!shape)
-                    throw new Error(`llvm emitter bug: dynCheck of unknown shape ${t.shapeId}`);
+                    throw new InternalCompilerError(`llvm emitter bug: dynCheck of unknown shape ${t.shapeId}`);
                 const struct = mangleRecordStruct(t.shapeId);
                 const fieldIndex = new Map(shape.fields.map((f, i) => [f.name, i + 1]));
                 const releaseR = () => {
@@ -779,7 +741,7 @@ export class LlDyn {
                 if (shape.tuple) {
                     const byIndex = [...shape.fields].sort((a, b) => Number(a.name) - Number(b.name));
                     const arityWant = host.cstr(`array of length ${byIndex.length}`);
-                    requireKind(DK.ARR, "dct");
+                    requireKind(DYN_KIND.ARR, "dct");
                     const len = this.lenOf(B, "%d");
                     const lenOk = B.tmp();
                     B.line(`${lenOk} = icmp eq ${host.sizeType} ${len}, ${byIndex.length}`);
@@ -803,11 +765,11 @@ export class LlDyn {
                     B.terminate(`ret ptr %r0`);
                     break;
                 }
-                requireKind(DK.OBJ, "dcr");
+                requireKind(DYN_KIND.OBJ, "dcr");
                 B.line(`%r0 = call ptr @${mangleRecordNew(t.shapeId)}()`);
                 for (const f of shape.fields) {
-                    const fieldWant = host.cstr(this.dynDesc(f.type));
-                    const utag = f.type.kind === "union" ? host.undefinedArmTag(f.type) : -1;
+                    const fieldWant = host.cstr(dynDesc(f.type, this.host.recordsById, this.host.unionsById));
+                    const utag = f.type.kind === "union" ? undefinedArmTag(f.type, host.unionsById) : -1;
                     const m = this.objGetLit(B, "%d", f.name);
                     if (f.type.kind === "dyn") {
                         // An `unknown` field: a present key passes through, a missing
@@ -931,7 +893,7 @@ export class LlDyn {
             case "array": {
                 const elem = t.elem;
                 const c = this.dynCheckHelper(elem);
-                requireKind(DK.ARR, "dca");
+                requireKind(DYN_KIND.ARR, "dca");
                 const n = this.lenOf(B, "%d");
                 const a = B.tmp();
                 B.line(`${a} = ${arrNewCall(host, elem, n)}`);
@@ -967,7 +929,7 @@ export class LlDyn {
             case "union": {
                 const def = host.unionsById.get(t.unionId);
                 if (!def)
-                    throw new Error(`llvm emitter bug: dynCheck of unknown union ${t.unionId}`);
+                    throw new InternalCompilerError(`llvm emitter bug: dynCheck of unknown union ${t.unionId}`);
                 // Arms in CANONICAL order, first FULL match wins. The matched
                 // arm's builder can no longer fail.
                 def.arms.forEach((arm, i) => {
@@ -1022,7 +984,7 @@ export class LlDyn {
                 const rc = vAdapters(host, t);
                 const kind = this.kindOf(B, "%d");
                 const capsule = B.tmp();
-                B.line(`${capsule} = icmp eq i32 ${kind}, ${DK.TYPED_REF}`);
+                B.line(`${capsule} = icmp eq i32 ${kind}, ${DYN_KIND.TYPED_REF}`);
                 const lCapsule = B.newLabel("dcu.cap");
                 const lFail = B.newLabel("dcu.fail");
                 B.condBr(capsule, lCapsule, lFail);
@@ -1090,7 +1052,7 @@ export class LlDyn {
                 // caps[0] obj-box owns the dyn value (untraced).
                 const adapter = this.dynFuncAdapterHelper(t);
                 const sigLit = host.cstr(key);
-                requireKind(DK.FUNC, "dcf");
+                requireKind(DYN_KIND.FUNC, "dcf");
                 host.declare(`declare i32 @strcmp(ptr, ptr)`);
                 const sigp = B.tmp();
                 const sig = B.tmp();
@@ -1148,7 +1110,7 @@ export class LlDyn {
         this.defs.push(`define internal ${retTy === "i1" ? "zeroext i1" : retTy} @${name}(ptr %d, ptr %path) ${FN_ATTRS} { ; check ${key}`, B.render(), `}`, ``);
         return name;
     }
-    /* ── toDynHelper (emit-walkers.ts, ported) ─────────────────────────── */
+    /* ── toDynHelper (walkers.ts, ported) ─────────────────────────── */
     /** `sc_td_<n>(<T> v) -> ptr` — build a fresh dyn value from a
      * static one (+1), DEEP-COPYING composites. Borrows the operand.
      * Never throws. */
@@ -1187,7 +1149,7 @@ export class LlDyn {
             case "object": {
                 // %Error only (canConvertToDyn's gate): the checked-dynamic tree's error encoding.
                 if (t.className !== "%Error") {
-                    throw new Error(`llvm emitter bug: to-dyn of class ${t.className}`);
+                    throw new InternalCompilerError(`llvm emitter bug: to-dyn of class ${t.className}`);
                 }
                 host.declare(`declare ptr @scr_dyn_from_error(ptr)`);
                 const r = B.tmp();
@@ -1208,7 +1170,7 @@ export class LlDyn {
             }
             case "bytes": {
                 if (t.elem !== "u8")
-                    throw new Error(`llvm emitter bug: to-dyn of bytes<${t.elem}>`);
+                    throw new InternalCompilerError(`llvm emitter bug: to-dyn of bytes<${t.elem}>`);
                 host.declare(`declare ptr @scr_dyn_new_bytes_copy(ptr)`);
                 const r = B.tmp();
                 B.line(`${r} = call ptr @scr_dyn_new_bytes_copy(ptr %v)`);
@@ -1218,7 +1180,7 @@ export class LlDyn {
             case "record": {
                 const shape = host.recordsById.get(t.shapeId);
                 if (!shape)
-                    throw new Error(`llvm emitter bug: to-dyn of unknown shape ${t.shapeId}`);
+                    throw new InternalCompilerError(`llvm emitter bug: to-dyn of unknown shape ${t.shapeId}`);
                 const struct = mangleRecordStruct(t.shapeId);
                 const fieldIndex = new Map(shape.fields.map((f, i) => [f.name, i + 1]));
                 const loadFieldOf = (fname, ft) => {
@@ -1306,71 +1268,54 @@ export class LlDyn {
                     const len = B.tmp();
                     B.line(`${ks} = call ptr @scr_map_keys_js_order(ptr ${ovf})`);
                     B.line(`${len} = call double @scr_arr_len(ptr ${ks})`);
-                    const iSlot = B.slot();
-                    B.entryAllocas.push(`${iSlot} = alloca double`);
-                    B.line(`store double ${f64Lit(0)}, ptr ${iSlot}`);
-                    const lc = B.newLabel("tdo.c");
-                    const lb = B.newLabel("tdo.b");
-                    const le = B.newLabel("tdo.e");
-                    B.br(lc);
-                    B.startBlock(lc);
-                    const i = B.tmp();
-                    const cont = B.tmp();
-                    B.line(`${i} = load double, ptr ${iSlot}`);
-                    B.line(`${cont} = fcmp olt double ${i}, ${len}`);
-                    B.condBr(cont, lb, le);
-                    B.startBlock(lb);
-                    const k = B.tmp();
-                    B.line(`${k} = call ptr @scr_arr_get_ref(ptr ${ks}, double ${i}) ; key (+1)`);
-                    const { len: klen, data: kdata } = this.strParts(B, k);
-                    if (iv.kind === "f64" || iv.kind === "bool") {
-                        const outTy = iv.kind === "f64" ? "double" : "i8";
-                        const outSlot = B.slot();
-                        B.entryAllocas.push(`${outSlot} = alloca ${outTy}`);
-                        B.line(`store ${outTy} ${iv.kind === "f64" ? f64Lit(0) : "0"}, ptr ${outSlot}`);
-                        host.declare(`declare zeroext i1 @scr_map_get_str_${iv.kind === "f64" ? "f64" : "bool"}(ptr, ptr, ptr)`);
-                        const found = B.tmp();
-                        B.line(`${found} = call zeroext i1 @scr_map_get_str_${iv.kind === "f64" ? "f64" : "bool"}(ptr ${ovf}, ptr ${k}, ptr ${outSlot})`);
-                        const raw = B.tmp();
-                        B.line(`${raw} = load ${outTy}, ptr ${outSlot}`);
-                        let val = raw;
-                        if (iv.kind === "bool") {
-                            val = B.tmp();
-                            B.line(`${val} = trunc i8 ${raw} to i1`);
+                    B.countedLoop(len, (i) => {
+                        const k = B.tmp();
+                        B.line(`${k} = call ptr @scr_arr_get_ref(ptr ${ks}, double ${i}) ; key (+1)`);
+                        const { len: klen, data: kdata } = this.strParts(B, k);
+                        if (iv.kind === "f64" || iv.kind === "bool") {
+                            const outTy = iv.kind === "f64" ? "double" : "i8";
+                            const outSlot = B.slot();
+                            B.entryAllocas.push(`${outSlot} = alloca ${outTy}`);
+                            B.line(`store ${outTy} ${iv.kind === "f64" ? f64Lit(0) : "0"}, ptr ${outSlot}`);
+                            host.declare(`declare zeroext i1 @scr_map_get_str_${iv.kind === "f64" ? "f64" : "bool"}(ptr, ptr, ptr)`);
+                            const found = B.tmp();
+                            B.line(`${found} = call zeroext i1 @scr_map_get_str_${iv.kind === "f64" ? "f64" : "bool"}(ptr ${ovf}, ptr ${k}, ptr ${outSlot})`);
+                            const raw = B.tmp();
+                            B.line(`${raw} = load ${outTy}, ptr ${outSlot}`);
+                            let val = raw;
+                            if (iv.kind === "bool") {
+                                val = B.tmp();
+                                B.line(`${val} = trunc i8 ${raw} to i1`);
+                            }
+                            const boxed = B.tmp();
+                            if (iv.kind === "f64") {
+                                host.declare(`declare ptr @scr_dyn_new_num(double)`);
+                                B.line(`${boxed} = call ptr @scr_dyn_new_num(double ${val})`);
+                            }
+                            else {
+                                host.declare(`declare ptr @scr_dyn_new_bool(i1 zeroext)`);
+                                B.line(`${boxed} = call ptr @scr_dyn_new_bool(i1 ${val})`);
+                            }
+                            B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${kdata}, ${host.sizeType} ${klen}, ptr ${boxed})`);
                         }
-                        const boxed = B.tmp();
-                        if (iv.kind === "f64") {
-                            host.declare(`declare ptr @scr_dyn_new_num(double)`);
-                            B.line(`${boxed} = call ptr @scr_dyn_new_num(double ${val})`);
+                        else if (iv.kind === "dyn") {
+                            // get_str_ref returns +1 — exactly the ownership obj_set takes.
+                            host.declare(`declare ptr @scr_map_get_str_ref(ptr, ptr)`);
+                            const hit = B.tmp();
+                            B.line(`${hit} = call ptr @scr_map_get_str_ref(ptr ${ovf}, ptr ${k})`);
+                            B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${kdata}, ${host.sizeType} ${klen}, ptr ${hit})`);
                         }
                         else {
-                            host.declare(`declare ptr @scr_dyn_new_bool(i1 zeroext)`);
-                            B.line(`${boxed} = call ptr @scr_dyn_new_bool(i1 ${val})`);
+                            host.declare(`declare ptr @scr_map_get_str_ref(ptr, ptr)`);
+                            const hit = B.tmp();
+                            B.line(`${hit} = call ptr @scr_map_get_str_ref(ptr ${ovf}, ptr ${k})`);
+                            const conv = B.tmp();
+                            B.line(`${conv} = call ptr @${this.toDynHelper(iv)}(ptr ${hit})`);
+                            B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${kdata}, ${host.sizeType} ${klen}, ptr ${conv})`);
+                            B.line(`call void ${releaseSym(host, iv)}(ptr ${hit})`);
                         }
-                        B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${kdata}, ${host.sizeType} ${klen}, ptr ${boxed})`);
-                    }
-                    else if (iv.kind === "dyn") {
-                        // get_str_ref returns +1 — exactly the ownership obj_set takes.
-                        host.declare(`declare ptr @scr_map_get_str_ref(ptr, ptr)`);
-                        const hit = B.tmp();
-                        B.line(`${hit} = call ptr @scr_map_get_str_ref(ptr ${ovf}, ptr ${k})`);
-                        B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${kdata}, ${host.sizeType} ${klen}, ptr ${hit})`);
-                    }
-                    else {
-                        host.declare(`declare ptr @scr_map_get_str_ref(ptr, ptr)`);
-                        const hit = B.tmp();
-                        B.line(`${hit} = call ptr @scr_map_get_str_ref(ptr ${ovf}, ptr ${k})`);
-                        const conv = B.tmp();
-                        B.line(`${conv} = call ptr @${this.toDynHelper(iv)}(ptr ${hit})`);
-                        B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${kdata}, ${host.sizeType} ${klen}, ptr ${conv})`);
-                        B.line(`call void ${releaseSym(host, iv)}(ptr ${hit})`);
-                    }
-                    B.line(`call void @scr_str_release(ptr ${k})`);
-                    const i2 = B.tmp();
-                    B.line(`${i2} = fadd double ${i}, ${f64Lit(1)}`);
-                    B.line(`store double ${i2}, ptr ${iSlot}`);
-                    B.br(lc);
-                    B.startBlock(le);
+                        B.line(`call void @scr_str_release(ptr ${k})`);
+                    });
                     B.line(`call void @scr_arr_release(ptr ${ks})`);
                 }
                 if (cyclicRec)
@@ -1394,51 +1339,34 @@ export class LlDyn {
                 B.line(`${d} = call ptr @scr_dyn_new_arr()`);
                 const len = B.tmp();
                 B.line(`${len} = call double @scr_arr_len(ptr %v)`);
-                const iSlot = B.slot();
-                B.entryAllocas.push(`${iSlot} = alloca double`);
-                B.line(`store double ${f64Lit(0)}, ptr ${iSlot}`);
-                const lc = B.newLabel("tda.c");
-                const lb = B.newLabel("tda.b");
-                const le = B.newLabel("tda.e");
-                B.br(lc);
-                B.startBlock(lc);
-                const i = B.tmp();
-                const cont = B.tmp();
-                B.line(`${i} = load double, ptr ${iSlot}`);
-                B.line(`${cont} = fcmp olt double ${i}, ${len}`);
-                B.condBr(cont, lb, le);
-                B.startBlock(lb);
-                if (elem.kind === "f64" || elem.kind === "bool") {
-                    const acc = elem.kind;
-                    const accTy = elem.kind === "f64" ? "double" : "i1";
-                    host.declare(`declare ${elem.kind === "bool" ? "zeroext i1" : accTy} @scr_arr_get_${acc}(ptr, double)`);
-                    const e = B.tmp();
-                    B.line(`${e} = call ${accTy} @scr_arr_get_${acc}(ptr %v, double ${i})`);
-                    const boxed = B.tmp();
-                    if (elem.kind === "f64") {
-                        host.declare(`declare ptr @scr_dyn_new_num(double)`);
-                        B.line(`${boxed} = call ptr @scr_dyn_new_num(double ${e})`);
+                B.countedLoop(len, (i) => {
+                    if (elem.kind === "f64" || elem.kind === "bool") {
+                        const acc = elem.kind;
+                        const accTy = elem.kind === "f64" ? "double" : "i1";
+                        host.declare(`declare ${elem.kind === "bool" ? "zeroext i1" : accTy} @scr_arr_get_${acc}(ptr, double)`);
+                        const e = B.tmp();
+                        B.line(`${e} = call ${accTy} @scr_arr_get_${acc}(ptr %v, double ${i})`);
+                        const boxed = B.tmp();
+                        if (elem.kind === "f64") {
+                            host.declare(`declare ptr @scr_dyn_new_num(double)`);
+                            B.line(`${boxed} = call ptr @scr_dyn_new_num(double ${e})`);
+                        }
+                        else {
+                            host.declare(`declare ptr @scr_dyn_new_bool(i1 zeroext)`);
+                            B.line(`${boxed} = call ptr @scr_dyn_new_bool(i1 ${e})`);
+                        }
+                        B.line(`call void @scr_dyn_arr_push(ptr ${d}, ptr ${boxed})`);
                     }
                     else {
-                        host.declare(`declare ptr @scr_dyn_new_bool(i1 zeroext)`);
-                        B.line(`${boxed} = call ptr @scr_dyn_new_bool(i1 ${e})`);
+                        host.declare(`declare ptr @scr_arr_get_ref(ptr, double)`);
+                        const e = B.tmp();
+                        B.line(`${e} = call ptr @scr_arr_get_ref(ptr %v, double ${i}) ; +1`);
+                        const conv = B.tmp();
+                        B.line(`${conv} = call ptr @${this.toDynHelper(elem)}(ptr ${e})`);
+                        B.line(`call void @scr_dyn_arr_push(ptr ${d}, ptr ${conv})`);
+                        B.line(`call void ${releaseSym(host, elem)}(ptr ${e})`);
                     }
-                    B.line(`call void @scr_dyn_arr_push(ptr ${d}, ptr ${boxed})`);
-                }
-                else {
-                    host.declare(`declare ptr @scr_arr_get_ref(ptr, double)`);
-                    const e = B.tmp();
-                    B.line(`${e} = call ptr @scr_arr_get_ref(ptr %v, double ${i}) ; +1`);
-                    const conv = B.tmp();
-                    B.line(`${conv} = call ptr @${this.toDynHelper(elem)}(ptr ${e})`);
-                    B.line(`call void @scr_dyn_arr_push(ptr ${d}, ptr ${conv})`);
-                    B.line(`call void ${releaseSym(host, elem)}(ptr ${e})`);
-                }
-                const i2 = B.tmp();
-                B.line(`${i2} = fadd double ${i}, ${f64Lit(1)}`);
-                B.line(`store double ${i2}, ptr ${iSlot}`);
-                B.br(lc);
-                B.startBlock(le);
+                });
                 if (cyclicArr)
                     B.line(`call void @scr_dyn_from_leave()`);
                 B.terminate(`ret ptr ${d}`);
@@ -1447,7 +1375,7 @@ export class LlDyn {
             case "union": {
                 const def = host.unionsById.get(t.unionId);
                 if (!def)
-                    throw new Error(`llvm emitter bug: to-dyn of unknown union ${t.unionId}`);
+                    throw new InternalCompilerError(`llvm emitter bug: to-dyn of unknown union ${t.unionId}`);
                 const tagp = B.tmp();
                 const tag = B.tmp();
                 B.line(`${tagp} = getelementptr inbounds %ScrUnion, ptr %v, i64 0, i32 1`);
@@ -1555,7 +1483,7 @@ export class LlDyn {
         return name;
     }
     /** The checked-dynamic tree-promise settle adapter for one fulfillment payload type —
-     * promiseDynAdapterHelper (emit-walkers.ts), ported:
+     * promiseDynAdapterHelper (walkers.ts), ported:
      * `void sc_pda_<n>(ptr %dst, ptr %src)` reads src's fulfilled payload
      * by its compile-time kind, converts it to a dyn value, and fulfills
      * dst with it (scr_dyn_new_promise_adapting's callback; rejections
@@ -1661,11 +1589,11 @@ export class LlDyn {
             const kd = this.kindOf(B, "%d");
             const done = B.newLabel("ds.d");
             const labels = new Map();
-            for (const k of [DK.NULL, DK.BOOL, DK.NUM, DK.STR, DK.ARR, DK.OBJ, DK.UNDEF, DK.BYTES, DK.FUNC, DK.HANDLE, DK.PROMISE, DK.JSVAL, DK.TYPED_REF]) {
+            for (const k of [DYN_KIND.NULL, DYN_KIND.BOOL, DYN_KIND.NUM, DYN_KIND.STR, DYN_KIND.ARR, DYN_KIND.OBJ, DYN_KIND.UNDEF, DYN_KIND.BYTES, DYN_KIND.FUNC, DYN_KIND.HANDLE, DYN_KIND.PROMISE, DYN_KIND.JSVAL, DYN_KIND.TYPED_REF]) {
                 labels.set(k, B.newLabel(`ds.k${k}`));
             }
             B.terminate(`switch i32 ${kd}, label %${done} [ ${[...labels].map(([k, l]) => `i32 ${k}, label %${l}`).join(" ")} ]`);
-            B.startBlock(labels.get(DK.JSVAL));
+            B.startBlock(labels.get(DYN_KIND.JSVAL));
             {
                 // Island-held: the engine's own ToString (a bridged failure
                 // leaves the exception pending and appends nothing).
@@ -1673,7 +1601,7 @@ export class LlDyn {
                 B.line(`call void @scr_dyn_isl_tostr_buf(ptr %b, ptr %d)`);
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.TYPED_REF));
+            B.startBlock(labels.get(DYN_KIND.TYPED_REF));
             {
                 host.declare(`declare ptr @scr_dyn_typed_ref_materialize(ptr)`);
                 host.declare(`declare void @scr_dyn_release_v(ptr)`);
@@ -1683,13 +1611,13 @@ export class LlDyn {
                 B.line(`call void @scr_dyn_release_v(ptr ${materialized})`);
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.UNDEF));
+            B.startBlock(labels.get(DYN_KIND.UNDEF));
             this.puts(B, "%b", "undefined");
             B.br(done);
-            B.startBlock(labels.get(DK.NULL));
+            B.startBlock(labels.get(DYN_KIND.NULL));
             this.puts(B, "%b", "null");
             B.br(done);
-            B.startBlock(labels.get(DK.BOOL));
+            B.startBlock(labels.get(DYN_KIND.BOOL));
             {
                 const bv = this.boolOf(B, "%d");
                 const s = B.tmp();
@@ -1697,7 +1625,7 @@ export class LlDyn {
                 B.line(`call void @scr_jb_puts(ptr %b, ptr ${s})`);
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.NUM));
+            B.startBlock(labels.get(DYN_KIND.NUM));
             {
                 // String(n): NaN/Infinity spelled out, not the JSON null.
                 const x = this.payloadOf(B, "%d", "double");
@@ -1707,13 +1635,13 @@ export class LlDyn {
                 B.line(`call void @scr_str_release(ptr ${s})`);
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.STR));
+            B.startBlock(labels.get(DYN_KIND.STR));
             {
                 const s = this.payloadOf(B, "%d", "ptr");
                 this.putScrStr(B, "%b", s);
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.ARR));
+            B.startBlock(labels.get(DYN_KIND.ARR));
             {
                 // Array.prototype.toString: join(",") — null/undefined ELEMENTS
                 // print empty (unlike top level), nested arrays flatten.
@@ -1734,8 +1662,8 @@ export class LlDyn {
                     const isU = B.tmp();
                     const isN = B.tmp();
                     const unit = B.tmp();
-                    B.line(`${isU} = icmp eq i32 ${ek}, ${DK.UNDEF}`);
-                    B.line(`${isN} = icmp eq i32 ${ek}, ${DK.NULL}`);
+                    B.line(`${isU} = icmp eq i32 ${ek}, ${DYN_KIND.UNDEF}`);
+                    B.line(`${isN} = icmp eq i32 ${ek}, ${DYN_KIND.NULL}`);
                     B.line(`${unit} = or i1 ${isU}, ${isN}`);
                     const lSkip = B.newLabel("ds.sk");
                     const lRec = B.newLabel("ds.rc");
@@ -1747,7 +1675,7 @@ export class LlDyn {
                 });
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.OBJ));
+            B.startBlock(labels.get(DYN_KIND.OBJ));
             {
                 // The checked-dynamic tree's error encoding renders Error.prototype.toString;
                 // plain objects are "[object Object]".
@@ -1776,7 +1704,7 @@ export class LlDyn {
                     B.startBlock(lt);
                     const k = this.kindOf(B, m);
                     const isStr = B.tmp();
-                    B.line(`${isStr} = icmp eq i32 ${k}, ${DK.STR}`);
+                    B.line(`${isStr} = icmp eq i32 ${k}, ${DYN_KIND.STR}`);
                     const ls = B.newLabel(`${hint}.s`);
                     B.condBr(isStr, ls, lj);
                     B.startBlock(ls);
@@ -1839,7 +1767,7 @@ export class LlDyn {
                 putIf(ems, "ds.pm");
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.BYTES));
+            B.startBlock(labels.get(DYN_KIND.BYTES));
             {
                 // Buffer-flavored values coerce utf8; plain Uint8Array joins
                 // its elements.
@@ -1894,7 +1822,7 @@ export class LlDyn {
                 });
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.FUNC));
+            B.startBlock(labels.get(DYN_KIND.FUNC));
             {
                 // Function.prototype.toString: the native-code form.
                 this.puts(B, "%b", "function ");
@@ -1914,10 +1842,10 @@ export class LlDyn {
                 this.puts(B, "%b", "() { [native code] }");
                 B.br(done);
             }
-            B.startBlock(labels.get(DK.HANDLE));
+            B.startBlock(labels.get(DYN_KIND.HANDLE));
             this.puts(B, "%b", "[object Object]");
             B.br(done);
-            B.startBlock(labels.get(DK.PROMISE));
+            B.startBlock(labels.get(DYN_KIND.PROMISE));
             // Object.prototype.toString with the Promise @@toStringTag.
             this.puts(B, "%b", "[object Promise]");
             B.br(done);
@@ -1930,7 +1858,7 @@ export class LlDyn {
             const B = new BlockBuilder();
             const kd = this.kindOf(B, "%d");
             const isStr = B.tmp();
-            B.line(`${isStr} = icmp eq i32 ${kd}, ${DK.STR}`);
+            B.line(`${isStr} = icmp eq i32 ${kd}, ${DYN_KIND.STR}`);
             const lFast = B.newLabel("ds.f");
             const lSlow = B.newLabel("ds.s");
             B.condBr(isStr, lFast, lSlow);
@@ -1952,7 +1880,7 @@ export class LlDyn {
         }
         return name;
     }
-    /* ── caughtToDyn (emit-walkers.ts, ported) ─────────────────────────── */
+    /* ── caughtToDyn (walkers.ts, ported) ─────────────────────────── */
     /** A catch binding flowing into an `unknown` slot: the typed→unknown
      * deep-copy stance over the exception snapshot's runtime kind. */
     caughtToDynHelper() {
@@ -2085,8 +2013,8 @@ export class LlDyn {
             const isU = B.tmp();
             const isN = B.tmp();
             const unit = B.tmp();
-            B.line(`${isU} = icmp eq i32 ${kd}, ${DK.UNDEF}`);
-            B.line(`${isN} = icmp eq i32 ${kd}, ${DK.NULL}`);
+            B.line(`${isU} = icmp eq i32 ${kd}, ${DYN_KIND.UNDEF}`);
+            B.line(`${isN} = icmp eq i32 ${kd}, ${DYN_KIND.NULL}`);
             B.line(`${unit} = or i1 ${isU}, ${isN}`);
             const lUnit = B.newLabel("kg.u");
             const lNext = B.newLabel("kg.n");
@@ -2127,7 +2055,7 @@ export class LlDyn {
         // ordinary property reads while the capsule itself keeps identity.
         {
             const isTyped = B.tmp();
-            B.line(`${isTyped} = icmp eq i32 ${kd}, ${DK.TYPED_REF}`);
+            B.line(`${isTyped} = icmp eq i32 ${kd}, ${DYN_KIND.TYPED_REF}`);
             const lTyped = B.newLabel("kg.tr");
             const lNext = B.newLabel("kg.n");
             B.condBr(isTyped, lTyped, lNext);
@@ -2147,7 +2075,7 @@ export class LlDyn {
         // scalar-normalized — the routed keyed read that retired the fence.
         {
             const isJv = B.tmp();
-            B.line(`${isJv} = icmp eq i32 ${kd}, ${DK.JSVAL}`);
+            B.line(`${isJv} = icmp eq i32 ${kd}, ${DYN_KIND.JSVAL}`);
             const lJv = B.newLabel("kg.jv");
             const lNext = B.newLabel("kg.n");
             B.condBr(isJv, lJv, lNext);
@@ -2161,7 +2089,7 @@ export class LlDyn {
         // OBJ: the own member (+1) or the undefined singleton.
         {
             const isObj = B.tmp();
-            B.line(`${isObj} = icmp eq i32 ${kd}, ${DK.OBJ}`);
+            B.line(`${isObj} = icmp eq i32 ${kd}, ${DYN_KIND.OBJ}`);
             const lObj = B.newLabel("kg.ob");
             const lNext = B.newLabel("kg.n");
             B.condBr(isObj, lObj, lNext);
@@ -2181,7 +2109,7 @@ export class LlDyn {
         // HANDLE: the tag's modeled properties through the installed ops.
         {
             const isH = B.tmp();
-            B.line(`${isH} = icmp eq i32 ${kd}, ${DK.HANDLE}`);
+            B.line(`${isH} = icmp eq i32 ${kd}, ${DYN_KIND.HANDLE}`);
             const lH = B.newLabel("kg.h");
             const lNext = B.newLabel("kg.n");
             B.condBr(isH, lH, lNext);
@@ -2290,7 +2218,7 @@ export class LlDyn {
         // BYTES: .length and canonical-index byte reads answer like Node.
         {
             const isB = B.tmp();
-            B.line(`${isB} = icmp eq i32 ${kd}, ${DK.BYTES}`);
+            B.line(`${isB} = icmp eq i32 ${kd}, ${DYN_KIND.BYTES}`);
             const lB = B.newLabel("kg.by");
             const lNext = B.newLabel("kg.n");
             B.condBr(isB, lB, lNext);
@@ -2339,7 +2267,7 @@ export class LlDyn {
         // FUNC: own props (defineProperties writes), then name/length.
         {
             const isF = B.tmp();
-            B.line(`${isF} = icmp eq i32 ${kd}, ${DK.FUNC}`);
+            B.line(`${isF} = icmp eq i32 ${kd}, ${DYN_KIND.FUNC}`);
             const lF = B.newLabel("kg.fn");
             const lNext = B.newLabel("kg.n");
             B.condBr(isF, lF, lNext);
@@ -2363,8 +2291,8 @@ export class LlDyn {
             const isA = B.tmp();
             const isS = B.tmp();
             const either = B.tmp();
-            B.line(`${isA} = icmp eq i32 ${kd}, ${DK.ARR}`);
-            B.line(`${isS} = icmp eq i32 ${kd}, ${DK.STR}`);
+            B.line(`${isA} = icmp eq i32 ${kd}, ${DYN_KIND.ARR}`);
+            B.line(`${isS} = icmp eq i32 ${kd}, ${DYN_KIND.STR}`);
             B.line(`${either} = or i1 ${isA}, ${isS}`);
             const lAS = B.newLabel("kg.as");
             const lNext = B.newLabel("kg.n");
@@ -2462,8 +2390,8 @@ export class LlDyn {
         const isU = B.tmp();
         const isN = B.tmp();
         const unit = B.tmp();
-        B.line(`${isU} = icmp eq i32 ${kd}, ${DK.UNDEF}`);
-        B.line(`${isN} = icmp eq i32 ${kd}, ${DK.NULL}`);
+        B.line(`${isU} = icmp eq i32 ${kd}, ${DYN_KIND.UNDEF}`);
+        B.line(`${isN} = icmp eq i32 ${kd}, ${DYN_KIND.NULL}`);
         B.line(`${unit} = or i1 ${isU}, ${isN}`);
         const lThrow = B.newLabel("ddc.t");
         const lOk = B.newLabel("ddc.o");
@@ -2526,7 +2454,7 @@ export class LlDyn {
         // Typed stream capsules iterate their cached, refreshed dyn view.
         {
             const isTyped = B.tmp();
-            B.line(`${isTyped} = icmp eq i32 ${kd}, ${DK.TYPED_REF}`);
+            B.line(`${isTyped} = icmp eq i32 ${kd}, ${DYN_KIND.TYPED_REF}`);
             const lTyped = B.newLabel("din.tr");
             const lNext = B.newLabel("din.nt");
             B.condBr(isTyped, lTyped, lNext);
@@ -2546,7 +2474,7 @@ export class LlDyn {
         // dyn-routing-ops).
         {
             const isJv = B.tmp();
-            B.line(`${isJv} = icmp eq i32 ${kd}, ${DK.JSVAL}`);
+            B.line(`${isJv} = icmp eq i32 ${kd}, ${DYN_KIND.JSVAL}`);
             const lJv = B.newLabel("din.jv");
             const lNotJv = B.newLabel("din.njv");
             B.condBr(isJv, lJv, lNotJv);
@@ -2562,9 +2490,9 @@ export class LlDyn {
         const okB = B.tmp();
         const ok01 = B.tmp();
         const ok = B.tmp();
-        B.line(`${okA} = icmp eq i32 ${kd}, ${DK.ARR}`);
-        B.line(`${okS} = icmp eq i32 ${kd}, ${DK.STR}`);
-        B.line(`${okB} = icmp eq i32 ${kd}, ${DK.BYTES}`);
+        B.line(`${okA} = icmp eq i32 ${kd}, ${DYN_KIND.ARR}`);
+        B.line(`${okS} = icmp eq i32 ${kd}, ${DYN_KIND.STR}`);
+        B.line(`${okB} = icmp eq i32 ${kd}, ${DYN_KIND.BYTES}`);
         B.line(`${ok01} = or i1 ${okA}, ${okS}`);
         B.line(`${ok} = or i1 ${ok01}, ${okB}`);
         const lGo = B.newLabel("din.g");
@@ -2582,7 +2510,7 @@ export class LlDyn {
         const lF = B.newLabel("din.f");
         const lDef = B.newLabel("din.d");
         const lTail = B.newLabel("din.e");
-        B.terminate(`switch i32 ${kd}, label %${lDef} [ i32 ${DK.UNDEF}, label %${lU} i32 ${DK.NULL}, label %${lN} i32 ${DK.BOOL}, label %${lB2} i32 ${DK.NUM}, label %${lNum} i32 ${DK.FUNC}, label %${lF} ]`);
+        B.terminate(`switch i32 ${kd}, label %${lDef} [ i32 ${DYN_KIND.UNDEF}, label %${lU} i32 ${DYN_KIND.NULL}, label %${lN} i32 ${DYN_KIND.BOOL}, label %${lB2} i32 ${DYN_KIND.NUM}, label %${lNum} i32 ${DYN_KIND.FUNC}, label %${lF} ]`);
         B.startBlock(lU);
         this.puts(B, buf, "undefined");
         B.br(lTail);