gofront 1.7.0 → 1.9.0

package/src/backend/wasm/encode.js

@@ -354,6 +354,7 @@ const OPCODES = {
 	"ref.func": 0xd2,
 	"ref.eq": 0xd3,
 	"ref.as_non_null": 0xd4,
+	br_on_null: 0xd5,
 };
 
 // 0xFC prefixed saturating truncations
@@ -418,11 +419,26 @@ const SIMD_OPCODES = {
 	"i64x2.replace_lane": 30,
 	"f32x4.extract_lane": 31,
 	"f32x4.replace_lane": 32,
+	"i32x4.eq": 55,
+	"f32x4.eq": 65,
+	"f32x4.ne": 66,
+	"f32x4.lt": 67,
+	"f32x4.gt": 68,
+	"f32x4.le": 69,
+	"f32x4.ge": 70,
 	"v128.not": 77,
 	"v128.and": 78,
 	"v128.andnot": 79,
 	"v128.or": 80,
 	"v128.xor": 81,
+	"v128.bitselect": 82,
+	"v128.any_true": 83,
+	"i32x4.all_true": 163,
+	"i32x4.bitmask": 164,
+	"f32x4.ceil": 103,
+	"f32x4.floor": 104,
+	"f32x4.trunc": 105,
+	"f32x4.nearest": 106,
 	"f32x4.abs": 224,
 	"f32x4.neg": 225,
 	"f32x4.sqrt": 227,
@@ -579,6 +595,7 @@ function encodeInstruction(inst) {
 
 			case "br":
 			case "br_if":
+			case "br_on_null":
 				return [byte, ...encodeU32LEB(inst.depth ?? inst.index ?? 0)];
 
 			case "br_table": {
@@ -703,35 +720,48 @@ function encodeTypeEntry(t) {
 		return [0x4e, ...count, ...innerBytes];
 	}
 
+	let compositeBytes;
 	if (t.form === "struct") {
 		// Struct type: 0x5F, vector of fields [valtype, mutability]
 		const fields = t.fields ?? [];
-		return [
+		compositeBytes = [
 			0x5f,
 			...encodeVector(fields, (f) => [
 				...encodeValType(f.type),
 				f.mutable ? 0x01 : 0x00,
 			]),
 		];
-	}
-
-	if (t.form === "array") {
+	} else if (t.form === "array") {
 		// Array type: 0x5E, field [valtype, mutability]
-		return [
+		compositeBytes = [
 			0x5e,
 			...encodeValType(t.elemType ?? t.type),
 			t.mutable ? 0x01 : 0x00,
 		];
+	} else {
+		// Function type: 0x60, params vector, results vector
+		const params = t.params ?? [];
+		const results = t.results ?? [];
+		compositeBytes = [
+			0x60,
+			...encodeVector(params, encodeValType),
+			...encodeVector(results, encodeValType),
+		];
 	}
 
-	// Function type: 0x60, params vector, results vector
-	const params = t.params ?? [];
-	const results = t.results ?? [];
-	return [
-		0x60,
-		...encodeVector(params, encodeValType),
-		...encodeVector(results, encodeValType),
-	];
+	if (t.sub) {
+		const superIndices =
+			t.superTypeIndex !== undefined
+				? [t.superTypeIndex]
+				: (t.superTypeIndices ?? []);
+		return [
+			0x50,
+			...encodeVector(superIndices, encodeU32LEB),
+			...compositeBytes,
+		];
+	}
+
+	return compositeBytes;
 }
 
 function encodeTypeSection(types) {

package/src/backend/wasm/globals.js

@@ -0,0 +1,491 @@
+// src/backend/wasm/globals.js
+// Package-level constants and variables: constant folding, zero values and the
+// synthesised `__init_globals` start function; plus interface dispatcher synthesis.
+
+import { foldConstExpr } from "../../typechecker/const-fold.js";
+import { orderPackageInits } from "../../typechecker/init-order.js";
+import { _someNode } from "./prescan.js";
+import {
+	isStringType,
+	isStructType,
+	toWasmType,
+	variadicAsSlice,
+} from "./types.js";
+
+// Package-level `const` declarations (iota is already substituted by the
+// parser).  Literals and expressions the folder can reduce become BasicLits in
+// `constCache`; whatever is left is recorded in `nonLiteralConsts` and later
+// becomes a global initialised by the start function.
+export function _collectPackageConsts(progs, mod, checker = null) {
+	const entries = [];
+	for (const p of progs) {
+		for (const d of p.decls ?? []) {
+			if (d.kind !== "ConstDecl") continue;
+			for (const spec of d.decls ?? []) {
+				for (let i = 0; i < spec.names.length; i++) {
+					if (spec.value?.[i])
+						entries.push({
+							name: spec.names[i],
+							expr: spec.value[i],
+							filename: p._filename,
+							source: p._source,
+						});
+				}
+			}
+		}
+	}
+	const resolve = (name) => mod.constCache.get(name) ?? null;
+	// Iterate to a fixpoint so a constant may refer to one declared later.
+	let pending = entries;
+	let progress = true;
+	while (progress && pending.length > 0) {
+		progress = false;
+		const rest = [];
+		for (const entry of pending) {
+			let lit = null;
+			try {
+				lit = foldConstExpr(entry.expr, resolve);
+			} catch (err) {
+				if (checker?.err) {
+					const savedFile = checker._currentFile;
+					const savedSource = checker._currentSource;
+					if (entry.filename) checker._currentFile = entry.filename;
+					if (entry.source) checker._currentSource = entry.source;
+					checker.err(err.message, entry.expr);
+					checker._currentFile = savedFile;
+					checker._currentSource = savedSource;
+				} else {
+					throw new Error(
+						`Constant expression error for '${entry.name}': ${err.message}`,
+					);
+				}
+				continue;
+			}
+			if (lit) {
+				mod.constCache.set(entry.name, lit);
+				progress = true;
+			} else {
+				rest.push(entry);
+			}
+		}
+		pending = rest;
+	}
+	for (const entry of pending) mod.nonLiteralConsts.add(entry.name);
+}
+
+function _isPointerGoType(t, mod) {
+	if (!t) return false;
+	if (t.kind === "pointer" || t.kind === "PointerType" || t.kind === "StarExpr")
+		return true;
+	// `type P *T` used as a field type: look through the name.
+	const named =
+		t.kind === "named" || t.kind === "TypeName" || t.kind === "Ident";
+	const under = named
+		? (t.underlying ?? mod.checker?.types?.get(t.name)?.underlying)
+		: null;
+	return under ? _isPointerGoType(under, mod) : false;
+}
+
+// Constant-expression zero value of a struct global. Nested struct values are
+// built in place: a null ref would trap on the first field access.
+// Null when a nested array is too large to build as a constant expression.
+function _zeroStructConst(structInfo, mod) {
+	const out = [];
+	for (const f of structInfo.fields) {
+		const zero = _zeroFieldConst(f, mod);
+		if (!zero) return null;
+		out.push(...zero);
+	}
+	out.push({ op: "struct.new", typeIndex: structInfo.typeIndex });
+	return out;
+}
+
+function _zeroFieldConst(f, mod) {
+	const w = f.wType;
+	if (w === "i64") return [{ op: "i64.const", value: 0n }];
+	if (w === "f32" || w === "f64") return [{ op: `${w}.const`, value: 0 }];
+	if (w === "externref") return [{ op: "ref.null", heapType: "extern" }];
+	if (w === "anyref") return [{ op: "ref.null", heapType: "any" }];
+	if (typeof w !== "object" || w === null)
+		return [{ op: "i32.const", value: 0 }];
+	const ti = w.typeIndex;
+	const slice = typeof ti === "number" ? mod.getSliceTypeByIndex(ti) : null;
+	if (slice) return [{ op: "global.get", index: slice.emptyGlobalIndex }];
+	if (typeof ti === "number" && !_isPointerGoType(f.goType, mod)) {
+		for (const s of mod.structTypes.values())
+			if (s.typeIndex === ti) return _zeroStructConst(s, mod);
+		// An array field is a value: a null ref would trap on first use.
+		if (_arrayShape(f.goType, mod.checker))
+			return _zeroArrayConst(f.goType, mod);
+	}
+	return [{ op: "ref.null", heapType: ti ?? "any" }];
+}
+
+// Length and element type of an array type (checker type, AST node or name).
+function _arrayShape(t, checker) {
+	if (!t) return null;
+	if (t.kind === "array" || t.kind === "ArrayType") {
+		const size = typeof t.size === "number" ? t.size : Number(t.size?.value);
+		return Number.isInteger(size) ? { size, elem: t.elem } : null;
+	}
+	if (t.kind === "named" && t.underlying)
+		return _arrayShape(t.underlying, checker);
+	if (t.kind === "TypeName" || t.kind === "Ident")
+		return _arrayShape(checker?.types?.get(t.name), checker);
+	return null;
+}
+
+// Constant-expression zero value of a package-level array global (a null ref
+// would trap on the first element access); null when it cannot be built.
+function _zeroArrayConst(goType, mod, depth = 0) {
+	const checker = mod.checker;
+	if (!goType || goType.kind === "pointer" || depth > 4) return null;
+	const shape = _arrayShape(goType, checker);
+	if (!shape) return null;
+	const { size, elem } = shape;
+	const arrInfo = mod.getArrayType(elem);
+	const elemW = toWasmType(elem, checker, mod);
+	let one = null;
+	if (_arrayShape(elem, checker)) {
+		one = _zeroArrayConst(elem, mod, depth + 1);
+		if (!one) return null;
+	} else if (
+		elem?.kind !== "pointer" &&
+		elem?.kind !== "StarExpr" &&
+		typeof elemW === "object" &&
+		isStructType(elem, checker, mod)
+	) {
+		const info = Array.from(mod.structTypes.values()).find(
+			(x) => x.typeIndex === elemW.typeIndex,
+		);
+		if (!info) return null;
+		one = _zeroStructConst(info, mod);
+		if (!one) return null;
+	}
+	if (!one)
+		return [
+			{ op: "i32.const", value: size },
+			{ op: "array.new_default", typeIndex: arrInfo.typeIndex },
+		];
+	if (size > 64) return null;
+	const out = [];
+	for (let i = 0; i < size; i++) out.push(...one);
+	out.push({ op: "array.new_fixed", typeIndex: arrInfo.typeIndex, size });
+	return out;
+}
+
+// True when the zero value of `t` holds a string (a string, or a struct or
+// array containing one). A constant expression cannot build the empty string,
+// so such globals get their zero value from the start function.
+function _zeroHasString(t, mod, depth = 0) {
+	if (!t || depth > 4 || _isPointerGoType(t, mod)) return false;
+	if (isStringType(t, mod.checker)) return true;
+	const shape = _arrayShape(t, mod.checker);
+	if (shape) return _zeroHasString(shape.elem, mod, depth + 1);
+	const w = toWasmType(t, mod.checker, mod);
+	if (typeof w === "object" && typeof w?.typeIndex === "number") {
+		const info = Array.from(mod.structTypes.values()).find(
+			(x) => x.typeIndex === w.typeIndex,
+		);
+		if (info)
+			return info.fields.some((f) => _zeroHasString(f.goType, mod, depth + 1));
+	}
+	return false;
+}
+
+// Types of the names in `var a, b = f()` / `var v, ok = m[k]`: one value fills
+// every name.
+function _spreadValueTypes(spec, value) {
+	if (spec._commaOk)
+		return [
+			value._mapValueType ?? value._type,
+			{ kind: "basic", name: "bool" },
+		];
+	return value?._type?.types ?? [];
+}
+
+export function _collectPackageGlobals(progs, mod, checker) {
+	const pending = []; // non-constant initializers, run by the start function
+	const pendingConsts = []; // unfoldable consts; they run before any var
+	for (const p of progs) {
+		for (const d of p.decls ?? []) {
+			const isConst = d.kind === "ConstDecl";
+			if (d.kind !== "VarDecl" && !isConst) continue;
+			for (const spec of d.decls ?? d.specs ?? [d]) {
+				const names = spec.names ?? (spec.name ? [spec.name] : []);
+				const values = spec.value ?? (spec.init ? [spec.init] : []);
+				for (let i = 0; i < names.length; i++) {
+					const name = names[i];
+					// Foldable consts live in `constCache`, not in a global.
+					if (isConst && !mod.isNonLiteralConst(name)) continue;
+					const spreadTypes =
+						values.length === 1 && names.length > 1
+							? _spreadValueTypes(spec, values[0])
+							: null;
+					const rawType =
+						spec.type ?? (spreadTypes ? spreadTypes[i] : values[i]?._type);
+					const wType = toWasmType(rawType, checker, mod);
+					const gIdx = mod.globals.length;
+					let needsRuntimeZero = false;
+					let initInsts = [{ op: `${wType}.const`, value: 0 }];
+					if (wType === "i64") initInsts = [{ op: "i64.const", value: 0n }];
+					else if (wType === "f32" || wType === "f64")
+						initInsts = [{ op: `${wType}.const`, value: 0.0 }];
+					else if (
+						wType === "externref" ||
+						wType === "anyref" ||
+						typeof wType === "object"
+					) {
+						const sliceInfo =
+							typeof wType === "object" && typeof wType.typeIndex === "number"
+								? mod.getSliceTypeByIndex(wType.typeIndex)
+								: null;
+						if (sliceInfo) {
+							initInsts = [
+								{ op: "global.get", index: sliceInfo.emptyGlobalIndex },
+							];
+						} else if (
+							typeof wType === "object" &&
+							typeof wType.typeIndex === "number" &&
+							rawType?.kind !== "pointer"
+						) {
+							const structInfo = Array.from(mod.structTypes.values()).find(
+								(s) => s.typeIndex === wType.typeIndex,
+							);
+							const arrZero = structInfo ? null : _zeroArrayConst(rawType, mod);
+							const structZero = structInfo
+								? _zeroStructConst(structInfo, mod)
+								: null;
+							if (structZero) {
+								initInsts = structZero;
+							} else if (arrZero) {
+								initInsts = arrZero;
+							} else if (
+								(structInfo || _arrayShape(rawType, checker)) &&
+								!values[i]
+							) {
+								// Too large for a constant expression: the start
+								// function builds the zero value.
+								needsRuntimeZero = true;
+								initInsts = [
+									{ op: "ref.null", heapType: wType.typeIndex ?? "any" },
+								];
+							} else {
+								initInsts = [
+									{ op: "ref.null", heapType: wType.typeIndex ?? "any" },
+								];
+							}
+						} else {
+							initInsts = [
+								{
+									op: "ref.null",
+									heapType:
+										typeof wType === "object"
+											? (wType.heapType ?? wType.typeIndex ?? "any")
+											: wType.replace("ref", ""),
+								},
+							];
+						}
+					}
+
+					if (values.length === 0 && _zeroHasString(rawType, mod))
+						needsRuntimeZero = true;
+
+					let litNode = values?.[i];
+					let sign = 1;
+					if (
+						litNode &&
+						litNode.kind === "UnaryExpr" &&
+						litNode.op === "-" &&
+						litNode.operand?.kind === "BasicLit"
+					) {
+						litNode = litNode.operand;
+						sign = -1;
+					}
+
+					let isConstInit = false;
+					if (litNode && litNode.kind === "BasicLit") {
+						if (litNode.litKind === "INT") {
+							isConstInit = true;
+							const s = String(litNode.value);
+							const clean = /^0[0-7]+$/.test(s) ? `0o${s.slice(1)}` : s;
+							initInsts = [
+								wType === "i64"
+									? {
+											op: "i64.const",
+											value: BigInt(sign) * BigInt(clean),
+										}
+									: {
+											op: "i32.const",
+											value: (sign * Number(clean)) | 0,
+										},
+							];
+						} else if (litNode.litKind === "FLOAT") {
+							isConstInit = true;
+							initInsts = [
+								{
+									op: `${wType}.const`,
+									value: sign * Number(litNode.value),
+								},
+							];
+						} else if (litNode.litKind === "BOOL") {
+							isConstInit = true;
+							initInsts = [
+								{
+									op: "i32.const",
+									value: litNode.value === "true" ? 1 : 0,
+								},
+							];
+						}
+					}
+					if (needsRuntimeZero) pending.push({ name, zeroType: rawType });
+					if (!isConst && i === 0 && values.length === 1 && names.length > 1) {
+						// `var q, r = pair()`: one call fills every name.
+						pending.push({ name, names, expr: values[0], types: spreadTypes });
+					}
+					if (values[i] && !isConstInit && names.length === values.length) {
+						(isConst ? pendingConsts : pending).push({
+							name,
+							expr: values[i],
+						});
+					}
+					mod.globals.push({
+						type: wType,
+						mutable: true,
+						init: initInsts,
+					});
+					mod.globalCache.set(name, {
+						index: gIdx,
+						type: wType,
+						goType: rawType,
+					});
+				}
+			}
+		}
+	}
+	// Initialisers run in dependency order (Go spec), not declaration order.
+	const rank = new Map();
+	for (const e of orderPackageInits(progs).vars)
+		for (const n of e.names) rank.set(n, rank.size);
+	pending.sort((a, b) => (rank.get(a.name) ?? 0) - (rank.get(b.name) ?? 0));
+	return [..._orderConstInits(pendingConsts), ...pending];
+}
+
+// Orders runtime-initialised consts so each runs after the consts it
+// references (Go allows a constant to use one declared later).
+export function _orderConstInits(entries) {
+	const byName = new Map(entries.map((e) => [e.name, e]));
+	const ordered = [];
+	const state = new Map();
+	const visit = (entry) => {
+		if (state.has(entry.name)) return;
+		state.set(entry.name, true);
+		_someNode(entry.expr, (n) => {
+			if (n.kind === "Ident" && byName.has(n.name)) visit(byName.get(n.name));
+			return false;
+		});
+		ordered.push(entry);
+	};
+	for (const e of entries) visit(e);
+	return ordered;
+}
+
+// Synthesises `__init_globals()` assigning every non-constant package-level
+// initializer in declaration order and invoking package `init()` functions;
+// registered as the module start function.
+export function _makeGlobalInitFunc(pending, initNames = []) {
+	const stmts = pending.map(({ name, names, expr, types, zeroType }) =>
+		zeroType
+			? { kind: "GlobalZeroInit", name, goType: zeroType }
+			: {
+					kind: "AssignStmt",
+					lhs: names
+						? names.map((n, i) => ({
+								kind: "Ident",
+								name: n,
+								_type: types?.[i] ?? expr._type?.types?.[i],
+							}))
+						: [{ kind: "Ident", name, _type: expr._type }],
+					op: "=",
+					rhs: [expr],
+				},
+	);
+	for (const initName of initNames) {
+		stmts.push({
+			kind: "ExprStmt",
+			expr: {
+				kind: "CallExpr",
+				func: { kind: "Ident", name: initName },
+				args: [],
+			},
+		});
+	}
+	stmts.push({ kind: "ReturnStmt", values: [] });
+	return {
+		kind: "FuncDecl",
+		name: "__init_globals",
+		params: [],
+		returnType: null,
+		body: { kind: "Block", stmts, list: stmts },
+		_isGlobalInit: true,
+	};
+}
+
+export function _makeInterfaceDispatcher(info, checker) {
+	let methodSig = info.methodSig;
+	if (!methodSig) {
+		const raw =
+			info.ifaceType?.kind === "named" && info.ifaceType.underlying
+				? info.ifaceType.underlying
+				: info.ifaceType;
+		const ifaceResolved = checker?.resolveType?.(raw) ?? raw;
+		const methods =
+			ifaceResolved?.methods ?? ifaceResolved?.underlying?.methods;
+		if (methods instanceof Map) {
+			methodSig = methods.get(info.methodName);
+		} else if (Array.isArray(methods)) {
+			methodSig = methods.find((m) => (m.name ?? m) === info.methodName);
+		}
+	}
+
+	const params = [{ name: "__recv", type: { kind: "basic", name: "any" } }];
+	if (methodSig?.params) {
+		const sigParams = variadicAsSlice(methodSig.params, methodSig.variadic);
+		for (let p = 0; p < sigParams.length; p++) {
+			params.push({ name: `__arg${p}`, type: sigParams[p] });
+		}
+	} else if (info.callNode?.args) {
+		for (let p = 0; p < info.callNode.args.length; p++) {
+			params.push({
+				name: `__arg${p}`,
+				type: info.callNode.args[p]._type ?? {
+					kind: "basic",
+					name: "any",
+				},
+			});
+		}
+	}
+
+	let returnType = info.callNode?._type ?? null;
+	if (methodSig?.returns) {
+		returnType =
+			methodSig.returns.length === 1
+				? methodSig.returns[0]
+				: methodSig.returns.length > 1
+					? { kind: "tuple", types: methodSig.returns }
+					: null;
+	}
+
+	return {
+		kind: "FuncDecl",
+		name: `__dispatch_${info.ifaceName}_${info.methodName}`,
+		params,
+		returnType,
+		body: { kind: "Block", stmts: [], list: [] },
+		_isInterfaceDispatcher: true,
+		_ifaceName: info.ifaceName,
+		_ifaceType: info.ifaceType,
+		_methodName: info.methodName,
+		_rootFuncDecl: null,
+	};
+}

package/src/backend/wasm/glue.js

@@ -1,14 +1,12 @@
 // src/backend/wasm/glue.js
 // Runtime imports and JS glue for executing GoFront WASM modules.
 
-import { WASM_IMPORTS_JS, WASM_STDLIB_JS } from "./boundary.js";
+import { WASM_IMPORTS_JS } from "./boundary.js";
 
 // The import table is authored once as source text (it is spliced into the
 // production bundle by the facade); evaluate that same text here so tests
 // exercise exactly what ships.  The text is a compile-time constant.
-const makeImports = new Function(
-	`${WASM_IMPORTS_JS}\n${WASM_STDLIB_JS}\nreturn __gfw_imports;`,
-)();
+const makeImports = new Function(`${WASM_IMPORTS_JS}\nreturn __gfw_imports;`)();
 
 function createWasmImports({
 	stringTable = [],