@fraczak/k 6.4.0 → 6.5.0

package/backends/wasm/src/kvm2wasm.mjs

@@ -159,6 +159,7 @@ export function lowerToWasm(relDef, name, options = {}) {
   for (const field of inputProductFields) {
     registers.add(field.local);
   }
+  registers.add("tail_loop_mark");
 
   let nextUnionId = 0;
   const tailLoopLabel = "$tail_loop";
@@ -379,6 +380,24 @@ export function lowerToWasm(relDef, name, options = {}) {
               );
               lines.push(branchWat);
             }
+            lines.push(`    ;; compact if arena growth exceeds 1MB`);
+            lines.push(`    global.get $arena_free`);
+            lines.push(`    local.get $tail_loop_mark`);
+            lines.push(`    i32.sub`);
+            lines.push(`    i32.const 1048576`);
+            lines.push(`    i32.gt_u`);
+            lines.push(`    if`);
+            lines.push(`      call $compact_start`);
+            for (let i = 0; i < N; i++) {
+              const fieldTmp = `${dest}_f${i}`;
+              lines.push(`      local.get $${fieldTmp}`);
+              lines.push(`      local.get $tail_loop_mark`);
+              lines.push(`      call $compact_obj`);
+              lines.push(`      local.set $${fieldTmp}`);
+            }
+            lines.push(`      local.get $tail_loop_mark`);
+            lines.push(`      call $compact_finish`);
+            lines.push(`    end`);
             for (let i = 0; i < N; i++) {
               const branch = sortedBranches[i];
               const fieldTmp = `${dest}_f${i}`;
@@ -565,6 +584,21 @@ export function lowerToWasm(relDef, name, options = {}) {
               registers.add(callSrc);
               materializeInputProduct(lines, callSrc);
             }
+            lines.push(`    ;; compact if arena growth exceeds 1MB`);
+            lines.push(`    global.get $arena_free`);
+            lines.push(`    local.get $tail_loop_mark`);
+            lines.push(`    i32.sub`);
+            lines.push(`    i32.const 1048576`);
+            lines.push(`    i32.gt_u`);
+            lines.push(`    if`);
+            lines.push(`      call $compact_start`);
+            lines.push(`      local.get $${callSrc}`);
+            lines.push(`      local.get $tail_loop_mark`);
+            lines.push(`      call $compact_obj`);
+            lines.push(`      local.set $${callSrc}`);
+            lines.push(`      local.get $tail_loop_mark`);
+            lines.push(`      call $compact_finish`);
+            lines.push(`    end`);
             lines.push(`    local.get $${callSrc}`);
             lines.push(`    local.set $in`);
             lines.push(initInputProductLocals());
@@ -641,6 +675,8 @@ export function lowerToWasm(relDef, name, options = {}) {
   const wat = `(func $${name} (export "${name}") (param $in i32) (result i32 i32)
 ${localDecls}
 ${inputProductLocalInit}
+    global.get $arena_free
+    local.set $tail_loop_mark
     (loop ${tailLoopLabel}
 ${profWat}${bodyWat}
     )

package/backends/wasm/src/wasm.mjs

@@ -31,6 +31,24 @@ const METADATA_SECTION = "k.metadata";
 const ARTIFACT_FORMAT = "k-wasm";
 const ARTIFACT_VERSION = 1;
 
+class OutOfMemoryError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "OutOfMemoryError";
+  }
+}
+
+function checkWasmOom(exports) {
+  if (exports.oom_flag && exports.oom_flag.value) {
+    const size = exports.oom_size ? exports.oom_size.value : 0;
+    const max = exports.arena_max ? exports.arena_max.value : 0;
+    const free = exports.arena_free ? exports.arena_free.value : 0;
+    throw new OutOfMemoryError(
+      `WebAssembly Out of Memory: linear memory arena exhausted (failed to allocate ${size} bytes; arena used: ${free >>> 0} bytes, arena max: ${max >>> 0} bytes)`
+    );
+  }
+}
+
 const cleanName = (name) => "rel_" + name.replace(/[^a-zA-Z0-9_]/g, "_");
 
 async function getWabt() {
@@ -894,9 +912,21 @@ async function instantiateWasmArtifact(wasmBuffer) {
     const t1 = process.hrtime.bigint();
     const mark = exports.arena_mark ? exports.arena_mark() : 0;
     const arenaValues = new Map();
-    const ptrIn = writeValueToArena(exports, value, inputPattern, 0, arenaValues, tags, metadata.inputPattern);
+    let ptrIn;
+    try {
+      ptrIn = writeValueToArena(exports, value, inputPattern, 0, arenaValues, tags, metadata.inputPattern);
+    } catch (error) {
+      checkWasmOom(exports);
+      throw error;
+    }
     const t2 = process.hrtime.bigint();
-    const result = exports[metadata.entry](ptrIn);
+    let result;
+    try {
+      result = exports[metadata.entry](ptrIn);
+    } catch (error) {
+      checkWasmOom(exports);
+      throw error;
+    }
     if (result[1] !== 1) {
       if (exports.arena_reset) exports.arena_reset(mark);
       throw new Error("Wasm relation execution failed (returned false)");
@@ -933,9 +963,21 @@ async function instantiateWasmArtifact(wasmBuffer) {
     const t1 = process.hrtime.bigint();
     const mark = exports.arena_mark ? exports.arena_mark() : 0;
     const arenaValues = new Map();
-    const ptrIn = writeValueToArena(exports, inputValue, inputPattern, 0, arenaValues, tags, metadata.inputPattern);
+    let ptrIn;
+    try {
+      ptrIn = writeValueToArena(exports, inputValue, inputPattern, 0, arenaValues, tags, metadata.inputPattern);
+    } catch (error) {
+      checkWasmOom(exports);
+      throw error;
+    }
     const t2 = process.hrtime.bigint();
-    const result = exports[metadata.entry](ptrIn);
+    let result;
+    try {
+      result = exports[metadata.entry](ptrIn);
+    } catch (error) {
+      checkWasmOom(exports);
+      throw error;
+    }
     if (result[1] !== 1) {
       if (exports.arena_reset) exports.arena_reset(mark);
       return undefined;
@@ -982,6 +1024,7 @@ export {
   ARTIFACT_FORMAT,
   ARTIFACT_VERSION,
   METADATA_SECTION,
+  OutOfMemoryError,
   appendCustomSection,
   compileWasmArtifactFromKVM,
   compileWasmArtifactFromObject,
@@ -998,6 +1041,7 @@ export default {
   ARTIFACT_FORMAT,
   ARTIFACT_VERSION,
   METADATA_SECTION,
+  OutOfMemoryError,
   appendCustomSection,
   compileWasmArtifactFromKVM,
   compileWasmArtifactFromObject,

package/backends/wasm/tests/test-wasm.mjs

@@ -88,6 +88,14 @@ console.log("==> Running runtime.wat Core Allocator Tests");
   const ptr3 = runtimeExports.alloc(70000);
   assert.ok(ptr3 > 1040, "Large allocation must return a valid pointer");
   assert.equal(ptr3 % 8, 0, "Large allocation must be 8-byte aligned");
+
+  // Test 5: Out of Memory flag recording on overflow
+  assert.equal(runtimeExports.oom_flag.value, 0, "OOM flag must be 0 initially");
+  assert.throws(() => {
+    runtimeExports.alloc(-1);
+  }, /unreachable/);
+  assert.equal(runtimeExports.oom_flag.value, 1, "OOM flag must be 1 after allocation failure");
+  assert.equal(runtimeExports.oom_size.value, -1, "OOM size must record requested size");
   console.log("Core Allocator tests passed successfully!");
 }