@scriptc/compiler 0.3.0 → 0.3.2

package/dist/backend/llvm/dyn.js

@@ -324,9 +324,11 @@ export class LlDyn {
         this.host.declare(`declare void @scr_jb_put_str(ptr, ptr)`);
         B.line(`call void @scr_jb_put_str(ptr ${buf}, ptr ${s})`);
     }
+    /** Fixed text and JSON tokens hold no lone surrogate, so they append
+     * without the builder's surrogate-pair seam check. */
     puts(B, buf, text) {
-        this.host.declare(`declare void @scr_jb_write(ptr, ptr, ${this.S})`);
-        B.line(`call void @scr_jb_write(ptr ${buf}, ptr ${this.host.cstr(text)}, ${this.S} ${Buffer.byteLength(text, "utf8")}) ; ${JSON.stringify(text)}`);
+        this.host.declare(`declare void @scr_jb_write_utf8(ptr, ptr, ${this.S})`);
+        B.line(`call void @scr_jb_write_utf8(ptr ${buf}, ptr ${this.host.cstr(text)}, ${this.S} ${Buffer.byteLength(text, "utf8")}) ; ${JSON.stringify(text)}`);
     }
     /** A size_t counting loop: emits header/body, calls `body(i)`, closes.
      * The body must not terminate its final block. */
@@ -963,6 +965,13 @@ export class LlDyn {
                     const lCache = B.newLabel("dc.tr.put");
                     B.condBr(hasCached, lRefresh, lCache);
                     B.startBlock(lRefresh);
+                    if (t.kind !== "record") {
+                        // Inline slots live in each header's block; move them out
+                        // before the storage pointers change hands.
+                        host.declare("declare void @scr_arr_outline(ptr)");
+                        B.line(`call void @scr_arr_outline(ptr ${cached})`);
+                        B.line(`call void @scr_arr_outline(ptr ${checked})`);
+                    }
                     const members = t.kind === "record"
                         ? [
                             ...shape.fields.map((field, index) => ({
@@ -985,6 +994,7 @@ export class LlDyn {
                             { index: 2, type: host.sizeType, name: "capacity" },
                             { index: SCR_ARR_FIELD.data, type: "ptr", name: "data" },
                             { index: SCR_ARR_FIELD.present, type: "ptr", name: "presence" },
+                            { index: SCR_ARR_FIELD.filled, type: "i32", name: "filled" },
                         ];
                     members.forEach((member) => {
                         const cachedPtr = B.tmp();
@@ -1582,6 +1592,9 @@ export class LlDyn {
                 B.line(`call void @scr_union_release(ptr ${checked})`);
                 B.terminate(`ret ptr ${cached}`);
                 B.startBlock(lCache);
+                // Later casts refresh this box in place (above), so from now on
+                // retypes of this union must not share a box (unionRetype).
+                B.line(`store i8 1, ptr ${host.retypeGuardRef(t.unionId)}`);
                 B.line(`call void @scr_dyn_typed_ref_cache_cast(ptr %d, ptr ${host.cstr(key)}, ${host.sizeType} ${Buffer.byteLength(key, "utf8")}, ptr ${checked}, ptr ${rc.retain}, ptr ${rc.release}, i1 ${traceAdapter(host, t) !== null ? "true" : "false"})`);
                 B.terminate(`ret ptr ${checked}`);
                 B.startBlock(lFail);