@scriptc/compiler 0.1.2 → 0.1.3

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

@@ -1,4 +1,8 @@
 import type { IrFfiCallbackParamClass, IrFfiReturnClass, IrFfiValueParamClass } from "../../ir/ir.js";
+/** User-controlled text embedded after an LLVM `;` comment marker. Preserve
+ * ordinary output byte-for-byte, but encode control and line-separator code
+ * units so a property name can never inject a line or invalid source byte. */
+export declare function llvmCommentText(text: string): string;
 export declare function ffiNativeTypeLl(cls: IrFfiCallbackParamClass | IrFfiValueParamClass | IrFfiReturnClass): string;
 export declare function f64Lit(n: number): string;
 export declare const F64_INF: string;

package/dist/backend/llvm/common.js

@@ -1,4 +1,10 @@
 import { InternalCompilerError } from "../../errors.js";
+/** User-controlled text embedded after an LLVM `;` comment marker. Preserve
+ * ordinary output byte-for-byte, but encode control and line-separator code
+ * units so a property name can never inject a line or invalid source byte. */
+export function llvmCommentText(text) {
+    return text.replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g, (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
 export function ffiNativeTypeLl(cls) {
     switch (cls) {
         case "f64":

package/dist/backend/llvm/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/backend/llvm/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,MAAM,UAAU,eAAe,CAC7B,GAAsE;IAEtE,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,KAAK;YACR,OAAO,QAAQ,CAAC;QAClB,KAAK,MAAM,CAAC;QACZ,KAAK,IAAI;YACP,OAAO,IAAI,CAAC;QACd,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,KAAK,CAAC;QACf,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO;YACV,MAAM,IAAI,qBAAqB,CAAC,iCAAiC,GAAG,2BAA2B,CAAC,CAAC;QACnG,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,CAAS;IAC9B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;AAC5G,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/backend/llvm/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD;;8EAE8E;AAC9E,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,2CAA2C,EAAE,CAAC,IAAI,EAAE,EAAE,CACxE,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CACzD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,GAAsE;IAEtE,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,KAAK;YACR,OAAO,QAAQ,CAAC;QAClB,KAAK,MAAM,CAAC;QACZ,KAAK,IAAI;YACP,OAAO,IAAI,CAAC;QACd,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,KAAK,CAAC;QACf,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO;YACV,MAAM,IAAI,qBAAqB,CAAC,iCAAiC,GAAG,2BAA2B,CAAC,CAAC;QACnG,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,CAAS;IAC9B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;AAC5G,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC"}

package/dist/backend/llvm/common.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/backend/llvm/common.test.js

@@ -0,0 +1,9 @@
+import { describe, expect, test } from "vitest";
+import { llvmCommentText } from "./common.js";
+describe("LLVM comment text", () => {
+    test("preserves ordinary names and encodes control characters", () => {
+        expect(llvmCommentText('quote"slash\\')).toBe('quote"slash\\');
+        expect(llvmCommentText("line\n\0tab\tunit\u001f\u007f\u0085\u2028")).toBe("line\\u000a\\u0000tab\\u0009unit\\u001f\\u007f\\u0085\\u2028");
+    });
+});
+//# sourceMappingURL=common.test.js.map

package/dist/backend/llvm/common.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.test.js","sourceRoot":"","sources":["../../../src/backend/llvm/common.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC/D,MAAM,CAAC,eAAe,CAAC,2CAA2C,CAAC,CAAC,CAAC,IAAI,CACvE,8DAA8D,CAC/D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -19,6 +19,10 @@ export declare const DYN_KIND: {
  * unit instances (undefined-armed dynCheck targets build them). */
 export interface DynHost extends WalkerHost {
     unitInstanceRef(unionId: string, tag: number): string;
+    liveDynRefAdapter(t: IrType): {
+        snapshot: string;
+        commit: string;
+    };
 }
 export declare class LlDyn {
     private readonly host;

package/dist/backend/llvm/dyn.js

@@ -1,8 +1,9 @@
 import { InternalCompilerError } from "../../errors.js";
-import { DYN_HANDLE_KINDS, isRefCounted, typeKey } from "../../ir/ir.js";
+import { DYN_HANDLE_KINDS, isDynTypedRefType, 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 { llvmCommentText } from "./common.js";
 import { arrNewCall, elemAccess, llFieldType, releaseSym, traceAdapter, traceArg, vAdapters } from "./shapes.js";
 import { LlvmUnsupportedError } from "./unsupported.js";
 /** ScrDynKind values (scr_runtime.h). */
@@ -166,7 +167,7 @@ export class LlDyn {
         this.host.declare(`declare ptr @scr_dyn_obj_get(ptr, ptr, ${this.S})`);
         const t = B.tmp();
         const len = Buffer.byteLength(key, "utf8");
-        B.line(`${t} = call ptr @scr_dyn_obj_get(ptr ${d}, ptr ${this.host.cstr(key)}, ${this.S} ${len}) ; .${key}`);
+        B.line(`${t} = call ptr @scr_dyn_obj_get(ptr ${d}, ptr ${this.host.cstr(key)}, ${this.S} ${len}) ; .${llvmCommentText(key)}`);
         return t;
     }
     /** Appends an ScrStr's bytes into a ScrJsonBuf (walkers' putScrStr). */
@@ -419,7 +420,7 @@ export class LlDyn {
                             B.startBlock(lCmp);
                             const c = B.tmp();
                             const same = B.tmp();
-                            B.line(`${c} = call i32 @memcmp(ptr ${ent.key}, ptr ${this.host.cstr(f.name)}, ${this.S} ${klen}) ; ${f.name}`);
+                            B.line(`${c} = call i32 @memcmp(ptr ${ent.key}, ptr ${this.host.cstr(f.name)}, ${this.S} ${klen}) ; ${llvmCommentText(f.name)}`);
                             B.line(`${same} = icmp eq i32 ${c}, 0`);
                             const lNo2 = B.newLabel("dm.kn");
                             const skip = B.newLabel("dm.ks");
@@ -633,7 +634,7 @@ export class LlDyn {
                             : "%ScrArr";
                         B.line(`${cachedPtr} = getelementptr inbounds ${struct}, ptr ${cached}, i64 0, i32 ${member.index}`);
                         B.line(`${checkedPtr} = getelementptr inbounds ${struct}, ptr ${checked}, i64 0, i32 ${member.index}`);
-                        B.line(`${oldValue} = load ${member.type}, ptr ${cachedPtr} ; ${member.name}`);
+                        B.line(`${oldValue} = load ${member.type}, ptr ${cachedPtr} ; ${llvmCommentText(member.name)}`);
                         B.line(`${newValue} = load ${member.type}, ptr ${checkedPtr}`);
                         B.line(`store ${member.type} ${newValue}, ptr ${cachedPtr}`);
                         B.line(`store ${member.type} ${oldValue}, ptr ${checkedPtr}`);
@@ -787,7 +788,7 @@ export class LlDyn {
                 const storeInto = (fieldName, ft, value) => {
                     const idx = fieldIndex.get(fieldName);
                     const p = B.tmp();
-                    B.line(`${p} = getelementptr inbounds %${struct}, ptr %r0, i64 0, i32 ${idx} ; .${fieldName}`);
+                    B.line(`${p} = getelementptr inbounds %${struct}, ptr %r0, i64 0, i32 ${idx} ; .${llvmCommentText(fieldName)}`);
                     if (llFieldType(ft) === "i8") {
                         const z = B.tmp();
                         B.line(`${z} = zext i1 ${value} to i8`);
@@ -909,7 +910,7 @@ export class LlDyn {
                             B.startBlock(lCmp);
                             const c = B.tmp();
                             const same = B.tmp();
-                            B.line(`${c} = call i32 @memcmp(ptr ${ent.key}, ptr ${host.cstr(f.name)}, ${host.sizeType} ${klen}) ; ${f.name}`);
+                            B.line(`${c} = call i32 @memcmp(ptr ${ent.key}, ptr ${host.cstr(f.name)}, ${host.sizeType} ${klen}) ; ${llvmCommentText(f.name)}`);
                             B.line(`${same} = icmp eq i32 ${c}, 0`);
                             const skip = B.newLabel("dcv.ks");
                             const lNo2 = B.newLabel("dcv.kn");
@@ -1207,13 +1208,23 @@ export class LlDyn {
                 break;
             }
             case "object": {
-                // %Error only (canConvertToDyn's gate): the checked-dynamic tree's error encoding.
-                if (t.className !== "%Error") {
-                    throw new InternalCompilerError(`llvm emitter bug: to-dyn of class ${t.className}`);
+                const className = t.className;
+                if (className === "%Error") {
+                    host.declare(`declare ptr @scr_dyn_from_error(ptr)`);
+                    const r = B.tmp();
+                    B.line(`${r} = call ptr @scr_dyn_from_error(ptr %v)`);
+                    B.terminate(`ret ptr ${r}`);
+                    break;
+                }
+                if (!isDynTypedRefType(t)) {
+                    throw new InternalCompilerError(`llvm emitter bug: to-dyn of runtime class ${className}`);
                 }
-                host.declare(`declare ptr @scr_dyn_from_error(ptr)`);
+                const adapter = host.liveDynRefAdapter(t);
+                const rc = vAdapters(host, t);
+                const keyLit = host.cstr(typeKey(t));
+                host.declare(`declare ptr @scr_dyn_new_typed_ref(ptr, ptr, ptr, ptr, ${host.sizeType}, ptr, ptr)`);
                 const r = B.tmp();
-                B.line(`${r} = call ptr @scr_dyn_from_error(ptr %v)`);
+                B.line(`${r} = call ptr @scr_dyn_new_typed_ref(ptr %v, ptr ${rc.retain}, ptr ${rc.release}, ptr ${keyLit}, ${host.sizeType} ${Buffer.byteLength(typeKey(t), "utf8")}, ptr @${adapter.snapshot}, ptr ${adapter.commit})`);
                 B.terminate(`ret ptr ${r}`);
                 break;
             }
@@ -1245,7 +1256,7 @@ export class LlDyn {
                 const fieldIndex = new Map(shape.fields.map((f, i) => [f.name, i + 1]));
                 const loadFieldOf = (fname, ft) => {
                     const p = B.tmp();
-                    B.line(`${p} = getelementptr inbounds %${struct}, ptr %v, i64 0, i32 ${fieldIndex.get(fname)} ; .${fname}`);
+                    B.line(`${p} = getelementptr inbounds %${struct}, ptr %v, i64 0, i32 ${fieldIndex.get(fname)} ; .${llvmCommentText(fname)}`);
                     const raw = B.tmp();
                     B.line(`${raw} = load ${llFieldType(ft)}, ptr ${p}`);
                     if (llFieldType(ft) !== "i8")
@@ -1311,7 +1322,7 @@ export class LlDyn {
                     const fv = loadFieldOf(f.name, f.type);
                     const conv = B.tmp();
                     B.line(`${conv} = call ptr @${this.toDynHelper(f.type)}(${this.valTy(f.type)} ${fv})`);
-                    B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${host.cstr(f.name)}, ${host.sizeType} ${klen}, ptr ${conv}) ; ${f.name}`);
+                    B.line(`call void @scr_dyn_obj_set(ptr ${d}, ptr ${host.cstr(f.name)}, ${host.sizeType} ${klen}, ptr ${conv}) ; ${llvmCommentText(f.name)}`);
                 }
                 if (shape.indexValue) {
                     const iv = shape.indexValue;