@scriptc/compiler 0.0.35 → 0.0.36

package/dist/backend/llvm/unsupported.d.ts

@@ -1,4 +1,4 @@
-import type { SrcLoc } from "../../ir/nodes.js";
+import type { SrcLoc } from "../../ir/ir.js";
 export declare class LlvmUnsupportedError extends Error {
     readonly kind: string;
     readonly loc?: SrcLoc | undefined;

package/dist/backend/llvm/walkers.d.ts

@@ -1,4 +1,4 @@
-import type { IrType, IrUnionDef } from "../../ir/nodes.js";
+import type { IrType, IrUnionDef } from "../../ir/ir.js";
 import { type ShapeHost } from "./shapes.js";
 /** What the walkers need from the emitter beyond the shape tables: union
  * defs, the undefined-arm probe, interned ScrStr literals (unit-arm
@@ -6,7 +6,6 @@ import { type ShapeHost } from "./shapes.js";
  * scr_error-style label texts). */
 export interface WalkerHost extends ShapeHost {
     readonly unionsById: Map<string, IrUnionDef>;
-    undefinedArmTag(t: IrType): number;
     /** `@`-ref of an interned immortal ScrStr literal. */
     internLiteral(text: string): string;
     /** `@`-ref of an interned NUL-terminated byte-array constant. */
@@ -50,7 +49,7 @@ export declare class LlWalkers {
     private emitArrayWriter;
     private emitUnionWriter;
     /** `JSON.stringify(v, null, space)` as a REWRITE of the compact text —
-     * Node's gap algorithm exactly (see emit-walkers.ts's sc_ji). The indent
+     * Node's gap algorithm exactly (see walkers.ts's sc_ji). The indent
      * rides as a NUL-terminated constant + byte length. */
     jsonIndentHelper(): string;
     /** The per-union ToString helper: unit arms return the interned

package/dist/backend/llvm/walkers.js

@@ -1,8 +1,10 @@
-import { isRefCounted, typeKey } from "../../ir/nodes.js";
+import { InternalCompilerError } from "../../errors.js";
+import { isRefCounted, typeKey } from "../../ir/ir.js";
 import { mangleRecordStruct } from "../mangle.js";
 import { BlockBuilder } from "./blocks.js";
 import { llFieldType, releaseSym, traceAdapter } from "./shapes.js";
 import { LlvmUnsupportedError } from "./unsupported.js";
+import { undefinedArmTag } from "../../ir/analysis.js";
 /** Exact double literal (the emitter's f64Lit — duplicated to avoid a
  * cyclic import; both spell every bit pattern identically). */
 function f64Lit(n) {
@@ -180,11 +182,11 @@ export class LlWalkers {
     emitRecordWriter(B, shapeId) {
         const shape = this.host.recordsById.get(shapeId);
         if (!shape)
-            throw new Error(`llvm emitter bug: jsonStringify of unknown shape ${shapeId}`);
+            throw new InternalCompilerError(`llvm emitter bug: jsonStringify of unknown shape ${shapeId}`);
         const fieldIndex = new Map(shape.fields.map((f, i) => [f.name, i + 1]));
         // CYCLE-CAPABLE shapes bracket the walk with the circular-detection
         // stack; edge labels stamp before members whose walk can re-enter —
-        // emit-walkers.ts's contract, ported.
+        // walkers.ts's contract, ported.
         const cyclic = traceAdapter(this.host, { kind: "record", shapeId }) !== null;
         const edgeable = (ft) => cyclic && traceAdapter(this.host, ft) !== null;
         if (cyclic)
@@ -213,11 +215,11 @@ export class LlWalkers {
         const order = shape.declaredOrder ?? shape.fields.map((f) => f.name);
         const inOrder = new Set(order);
         if (shape.fields.some((f) => !inOrder.has(f.name) && !f.name.startsWith("%"))) {
-            throw new Error(`llvm emitter bug: declaredOrder of shape ${shapeId} omits a non-internal field`);
+            throw new InternalCompilerError(`llvm emitter bug: declaredOrder of shape ${shapeId} omits a non-internal field`);
         }
         const byName = new Map(shape.fields.map((f) => [f.name, f]));
         const emitFields = order.map((n) => byName.get(n)).filter((f) => f !== undefined);
-        const droppable = emitFields.some((f) => this.host.undefinedArmTag(f.type) >= 0) || !!shape.indexValue;
+        const droppable = emitFields.some((f) => undefinedArmTag(f.type, this.host.unionsById) >= 0) || !!shape.indexValue;
         this.putc(B, "%b", "123"); // '{'
         if (!droppable) {
             emitFields.forEach((f, i) => {
@@ -245,7 +247,7 @@ export class LlWalkers {
                 B.line(`store i1 false, ptr ${first}`);
             };
             for (const f of emitFields) {
-                const utag = this.host.undefinedArmTag(f.type);
+                const utag = undefinedArmTag(f.type, this.host.unionsById);
                 const v = this.loadField(B, "%v", shapeId, fieldIndex.get(f.name), f.type);
                 let skip = null;
                 if (utag >= 0) {
@@ -293,110 +295,90 @@ export class LlWalkers {
         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("ovf.c");
-        const lb = B.newLabel("ovf.b");
-        const ln = B.newLabel("ovf.n");
-        const le = B.newLabel("ovf.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)`);
-        // The entry value, type-directed off the overflow VALUE type.
-        let val;
-        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}`);
-            if (iv.kind === "bool") {
-                val = B.tmp();
-                B.line(`${val} = trunc i8 ${raw} to i1`);
+        B.countedLoop(len, (i, next) => {
+            const k = B.tmp();
+            B.line(`${k} = call ptr @scr_arr_get_ref(ptr ${ks}, double ${i}) ; key (+1)`);
+            // The entry value, type-directed off the overflow VALUE type.
+            let val;
+            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}`);
+                if (iv.kind === "bool") {
+                    val = B.tmp();
+                    B.line(`${val} = trunc i8 ${raw} to i1`);
+                }
+                else {
+                    val = raw;
+                }
             }
             else {
-                val = raw;
+                host.declare(`declare ptr @scr_map_get_str_ref(ptr, ptr)`);
+                val = B.tmp();
+                B.line(`${val} = call ptr @scr_map_get_str_ref(ptr ${ovf}, ptr ${k}) ; value (+1)`);
             }
-        }
-        else {
-            host.declare(`declare ptr @scr_map_get_str_ref(ptr, ptr)`);
-            val = B.tmp();
-            B.line(`${val} = call ptr @scr_map_get_str_ref(ptr ${ovf}, ptr ${k}) ; value (+1)`);
-        }
-        // Undefined-valued entries drop, exactly the optional-field rule: a
-        // dyn value whose dyn kind follows its size_t RC word (enum
-        // member 6 — scr_runtime.h's ScrDynKind), or a union holding its
-        // undefined arm.
-        let skipUndef = null;
-        if (iv.kind === "dyn") {
-            const kp = B.tmp();
-            const kd = B.tmp();
-            const isu = B.tmp();
-            B.line(`${kp} = getelementptr inbounds i8, ptr ${val}, i64 ${this.abiOffset(8, 4)} ; ->kind`);
-            B.line(`${kd} = load i32, ptr ${kp}`);
-            B.line(`${isu} = icmp eq i32 ${kd}, 6 ; SCR_DYN_UNDEF (NULL is 0 — null members DO serialize)`);
-            skipUndef = isu;
-        }
-        else if (this.host.undefinedArmTag(iv) >= 0) {
-            const tag = this.unionTag(B, val);
-            const isu = B.tmp();
-            B.line(`${isu} = icmp eq i32 ${tag}, ${this.host.undefinedArmTag(iv)}`);
-            skipUndef = isu;
-        }
-        if (skipUndef !== null) {
-            const ld = B.newLabel("ovf.d");
-            const write = B.newLabel("ovf.w");
-            B.condBr(skipUndef, ld, write);
-            B.startBlock(ld);
+            // Undefined-valued entries drop, exactly the optional-field rule: a
+            // dyn value whose dyn kind follows its size_t RC word (enum
+            // member 6 — scr_runtime.h's ScrDynKind), or a union holding its
+            // undefined arm.
+            let skipUndef = null;
+            if (iv.kind === "dyn") {
+                const kp = B.tmp();
+                const kd = B.tmp();
+                const isu = B.tmp();
+                B.line(`${kp} = getelementptr inbounds i8, ptr ${val}, i64 ${this.abiOffset(8, 4)} ; ->kind`);
+                B.line(`${kd} = load i32, ptr ${kp}`);
+                B.line(`${isu} = icmp eq i32 ${kd}, 6 ; SCR_DYN_UNDEF (NULL is 0 — null members DO serialize)`);
+                skipUndef = isu;
+            }
+            else if (undefinedArmTag(iv, this.host.unionsById) >= 0) {
+                const tag = this.unionTag(B, val);
+                const isu = B.tmp();
+                B.line(`${isu} = icmp eq i32 ${tag}, ${undefinedArmTag(iv, this.host.unionsById)}`);
+                skipUndef = isu;
+            }
+            if (skipUndef !== null) {
+                const ld = B.newLabel("ovf.d");
+                const write = B.newLabel("ovf.w");
+                B.condBr(skipUndef, ld, write);
+                B.startBlock(ld);
+                if (isRefCounted(iv))
+                    B.line(`call void ${releaseSym(host, iv)}(ptr ${val})`);
+                B.line(`call void @scr_str_release(ptr ${k})`);
+                B.br(next);
+                B.startBlock(write);
+            }
+            // The comma dance over the shared `first` flag.
+            {
+                const isf = B.tmp();
+                const lcm = B.newLabel("ovf.cm");
+                const lj = B.newLabel("ovf.cj");
+                B.line(`${isf} = load i1, ptr ${first}`);
+                B.condBr(isf, lj, lcm);
+                B.startBlock(lcm);
+                this.putc(B, "%b", "44"); // ','
+                B.br(lj);
+                B.startBlock(lj);
+                B.line(`store i1 false, ptr ${first}`);
+            }
+            host.declare(`declare void @scr_jb_put_json_str(ptr, ptr)`);
+            B.line(`call void @scr_jb_put_json_str(ptr %b, ptr ${k})`);
+            this.putc(B, "%b", "58"); // ':'
+            if (edgeKeys) {
+                this.host.declare(`declare void @scr_jb_edge_key(ptr, ptr)`);
+                B.line(`call void @scr_jb_edge_key(ptr %b, ptr ${k})`);
+            }
+            B.line(`call void @${this.jsonWriteHelper(iv)}(ptr %b, ${this.valTy(iv)} ${val})`);
+            B.line(`call void @scr_str_release(ptr ${k})`);
             if (isRefCounted(iv))
                 B.line(`call void ${releaseSym(host, iv)}(ptr ${val})`);
-            B.line(`call void @scr_str_release(ptr ${k})`);
-            B.br(ln);
-            B.startBlock(write);
-        }
-        // The comma dance over the shared `first` flag.
-        {
-            const isf = B.tmp();
-            const lcm = B.newLabel("ovf.cm");
-            const lj = B.newLabel("ovf.cj");
-            B.line(`${isf} = load i1, ptr ${first}`);
-            B.condBr(isf, lj, lcm);
-            B.startBlock(lcm);
-            this.putc(B, "%b", "44"); // ','
-            B.br(lj);
-            B.startBlock(lj);
-            B.line(`store i1 false, ptr ${first}`);
-        }
-        host.declare(`declare void @scr_jb_put_json_str(ptr, ptr)`);
-        B.line(`call void @scr_jb_put_json_str(ptr %b, ptr ${k})`);
-        this.putc(B, "%b", "58"); // ':'
-        if (edgeKeys) {
-            this.host.declare(`declare void @scr_jb_edge_key(ptr, ptr)`);
-            B.line(`call void @scr_jb_edge_key(ptr %b, ptr ${k})`);
-        }
-        B.line(`call void @${this.jsonWriteHelper(iv)}(ptr %b, ${this.valTy(iv)} ${val})`);
-        B.line(`call void @scr_str_release(ptr ${k})`);
-        if (isRefCounted(iv))
-            B.line(`call void ${releaseSym(host, iv)}(ptr ${val})`);
-        B.br(ln);
-        B.startBlock(ln);
-        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);
+        });
         host.declare(`declare void @scr_arr_release(ptr)`);
         B.line(`call void @scr_arr_release(ptr ${ks})`);
     }
@@ -411,55 +393,38 @@ export class LlWalkers {
         this.putc(B, "%b", "91"); // '['
         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("jwa.c");
-        const lb = B.newLabel("jwa.b");
-        const le = B.newLabel("jwa.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 nz = B.tmp();
-        const lcm = B.newLabel("jwa.cm");
-        const lj = B.newLabel("jwa.cj");
-        B.line(`${nz} = fcmp ogt double ${i}, ${f64Lit(0)}`);
-        B.condBr(nz, lcm, lj);
-        B.startBlock(lcm);
-        this.putc(B, "%b", "44"); // ','
-        B.br(lj);
-        B.startBlock(lj);
-        if (cyclic) {
-            const idx = B.tmp();
-            B.line(`${idx} = fptoui double ${i} to ${this.S}`);
-            this.jbEdgeIdx(B, idx);
-        }
-        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 v = B.tmp();
-            B.line(`${v} = call ${accTy} @scr_arr_get_${acc}(ptr %v, double ${i})`);
-            B.line(`call void @${w}(ptr %b, ${accTy} ${v})`);
-        }
-        else {
-            // _get_ref returns +1; release after writing.
-            host.declare(`declare ptr @scr_arr_get_ref(ptr, double)`);
-            const v = B.tmp();
-            B.line(`${v} = call ptr @scr_arr_get_ref(ptr %v, double ${i})`);
-            B.line(`call void @${w}(ptr %b, ptr ${v})`);
-            B.line(`call void ${releaseSym(host, elem)}(ptr ${v})`);
-        }
-        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.countedLoop(len, (i) => {
+            const nz = B.tmp();
+            const lcm = B.newLabel("jwa.cm");
+            const lj = B.newLabel("jwa.cj");
+            B.line(`${nz} = fcmp ogt double ${i}, ${f64Lit(0)}`);
+            B.condBr(nz, lcm, lj);
+            B.startBlock(lcm);
+            this.putc(B, "%b", "44"); // ','
+            B.br(lj);
+            B.startBlock(lj);
+            if (cyclic) {
+                const idx = B.tmp();
+                B.line(`${idx} = fptoui double ${i} to ${this.S}`);
+                this.jbEdgeIdx(B, idx);
+            }
+            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 v = B.tmp();
+                B.line(`${v} = call ${accTy} @scr_arr_get_${acc}(ptr %v, double ${i})`);
+                B.line(`call void @${w}(ptr %b, ${accTy} ${v})`);
+            }
+            else {
+                // _get_ref returns +1; release after writing.
+                host.declare(`declare ptr @scr_arr_get_ref(ptr, double)`);
+                const v = B.tmp();
+                B.line(`${v} = call ptr @scr_arr_get_ref(ptr %v, double ${i})`);
+                B.line(`call void @${w}(ptr %b, ptr ${v})`);
+                B.line(`call void ${releaseSym(host, elem)}(ptr ${v})`);
+            }
+        });
         this.putc(B, "%b", "93"); // ']'
         if (cyclic)
             this.jbLeave(B);
@@ -467,7 +432,7 @@ export class LlWalkers {
     emitUnionWriter(B, unionId) {
         const def = this.host.unionsById.get(unionId);
         if (!def)
-            throw new Error(`llvm emitter bug: jsonStringify of unknown union ${unionId}`);
+            throw new InternalCompilerError(`llvm emitter bug: jsonStringify of unknown union ${unionId}`);
         const tag = this.unionTag(B, "%v");
         const bad = B.newLabel("jwu.bad");
         const done = B.newLabel("jwu.d");
@@ -516,7 +481,7 @@ export class LlWalkers {
     }
     /* ── the pretty-print re-indenter (jsonIndentHelper, ported) ──────────── */
     /** `JSON.stringify(v, null, space)` as a REWRITE of the compact text —
-     * Node's gap algorithm exactly (see emit-walkers.ts's sc_ji). The indent
+     * Node's gap algorithm exactly (see walkers.ts's sc_ji). The indent
      * rides as a NUL-terminated constant + byte length. */
     jsonIndentHelper() {
         if (this.indentFn)
@@ -698,7 +663,7 @@ export class LlWalkers {
             return existing;
         const def = this.host.unionsById.get(unionId);
         if (!def)
-            throw new Error(`llvm emitter bug: ToString of unknown union ${unionId}`);
+            throw new InternalCompilerError(`llvm emitter bug: ToString of unknown union ${unionId}`);
         const name = `sc_us_${this.unionToStrFns.size}`;
         this.unionToStrFns.set(unionId, name);
         const host = this.host;
@@ -767,7 +732,7 @@ export class LlWalkers {
             return existing;
         const def = this.host.unionsById.get(unionId);
         if (!def)
-            throw new Error(`llvm emitter bug: join of unknown union ${unionId}`);
+            throw new InternalCompilerError(`llvm emitter bug: join of unknown union ${unionId}`);
         const name = `sc_uj_${this.unionJoinFns.size}`;
         this.unionJoinFns.set(unionId, name);
         const toStr = this.unionToStrHelper(unionId);
@@ -781,72 +746,53 @@ export class LlWalkers {
         host.declare(`declare void @scr_str_release(ptr)`);
         const B = new BlockBuilder();
         const buf = "%jb";
-        const iSlot = "%i";
-        B.entryAllocas.push(`${buf} = alloca %ScrJsonBuf`, `${iSlot} = alloca double`);
+        B.entryAllocas.push(`${buf} = alloca %ScrJsonBuf`);
         B.line(`call void @scr_jb_init(ptr ${buf})`);
-        B.line(`store double ${f64Lit(0)}, ptr ${iSlot}`);
         const len = B.tmp();
         B.line(`${len} = call double @scr_arr_len(ptr %a)`);
-        const lc = B.newLabel("uj.c");
-        const lb = B.newLabel("uj.b");
-        const ln = B.newLabel("uj.n");
-        const le = B.newLabel("uj.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 (i) put sep bytes` — separators between elements only.
-        const nz = B.tmp();
-        const lsep = B.newLabel("uj.s");
-        const lel = B.newLabel("uj.v");
-        B.line(`${nz} = fcmp ogt double ${i}, ${f64Lit(0)}`);
-        B.condBr(nz, lsep, lel);
-        B.startBlock(lsep);
-        this.putScrStr(B, buf, "%sep");
-        B.br(lel);
-        B.startBlock(lel);
-        const u = B.tmp();
-        B.line(`${u} = call ptr @scr_arr_get_ref(ptr %a, double ${i}) ; element (+1)`);
-        if (unitTags.length > 0) {
-            // Nullish arms print empty, exactly JS's join.
-            const tag = this.unionTag(B, u);
-            let acc = "";
-            for (const t of unitTags) {
-                const cnd = B.tmp();
-                B.line(`${cnd} = icmp eq i32 ${tag}, ${t}`);
-                if (acc === "") {
-                    acc = cnd;
-                }
-                else {
-                    const o = B.tmp();
-                    B.line(`${o} = or i1 ${acc}, ${cnd}`);
-                    acc = o;
+        B.countedLoop(len, (i, next) => {
+            // `if (i) put sep bytes` — separators between elements only.
+            const nz = B.tmp();
+            const lsep = B.newLabel("uj.s");
+            const lel = B.newLabel("uj.v");
+            B.line(`${nz} = fcmp ogt double ${i}, ${f64Lit(0)}`);
+            B.condBr(nz, lsep, lel);
+            B.startBlock(lsep);
+            this.putScrStr(B, buf, "%sep");
+            B.br(lel);
+            B.startBlock(lel);
+            const u = B.tmp();
+            B.line(`${u} = call ptr @scr_arr_get_ref(ptr %a, double ${i}) ; element (+1)`);
+            if (unitTags.length > 0) {
+                // Nullish arms print empty, exactly JS's join.
+                const tag = this.unionTag(B, u);
+                let acc = "";
+                for (const t of unitTags) {
+                    const cnd = B.tmp();
+                    B.line(`${cnd} = icmp eq i32 ${tag}, ${t}`);
+                    if (acc === "") {
+                        acc = cnd;
+                    }
+                    else {
+                        const o = B.tmp();
+                        B.line(`${o} = or i1 ${acc}, ${cnd}`);
+                        acc = o;
+                    }
                 }
+                const lskip = B.newLabel("uj.k");
+                const lwrite = B.newLabel("uj.w");
+                B.condBr(acc, lskip, lwrite);
+                B.startBlock(lskip);
+                B.line(`call void @scr_union_release(ptr ${u})`);
+                B.br(next);
+                B.startBlock(lwrite);
             }
-            const lskip = B.newLabel("uj.k");
-            const lwrite = B.newLabel("uj.w");
-            B.condBr(acc, lskip, lwrite);
-            B.startBlock(lskip);
+            const s = B.tmp();
+            B.line(`${s} = call ptr @${toStr}(ptr ${u})`);
+            this.putScrStr(B, buf, s);
+            B.line(`call void @scr_str_release(ptr ${s})`);
             B.line(`call void @scr_union_release(ptr ${u})`);
-            B.br(ln);
-            B.startBlock(lwrite);
-        }
-        const s = B.tmp();
-        B.line(`${s} = call ptr @${toStr}(ptr ${u})`);
-        this.putScrStr(B, buf, s);
-        B.line(`call void @scr_str_release(ptr ${s})`);
-        B.line(`call void @scr_union_release(ptr ${u})`);
-        B.br(ln);
-        B.startBlock(ln);
-        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);
+        });
         const r = B.tmp();
         B.line(`${r} = call ptr @scr_jb_finish(ptr ${buf})`);
         B.terminate(`ret ptr ${r}`);