Wasmtest: Fix testing framework to import core::error

Author: btzy

lib-backend-wasm/src/gc/cheney/wasmtest.rs

@@ -2,7 +2,7 @@ use super::*;
 use wasm_test_harness::*;
 
 pub fn wasmtest<C: TestContext>(c: &mut C) {
-    c.add_test("no roots", |code_builder, wasm_module, t| {
+    c.add_test("no roots", |code_builder, wasm_module, error_func, t| {
         /*
         In this test we will create a Cheney with the initial size (1MiB usuable size),
         and add 32768 copies of 28-byte structs (which will exactly hit the maximum size (including 4-byte tag)).
@@ -27,6 +27,7 @@ pub fn wasmtest<C: TestContext>(c: &mut C) {
             mem,
             0,
             MEM_INITIAL_HEAP_SIZE,
+            error_func,
             wasm_module,
         );
 
@@ -135,7 +136,7 @@ pub fn wasmtest<C: TestContext>(c: &mut C) {
         t.i32_assert_eq(&mut scratch, expr_builder);
     });
 
-    c.add_test("all roots", |code_builder, wasm_module, t| {
+    c.add_test("all roots", |code_builder, wasm_module, error_func, t| {
         /*
         In this test we will create a Cheney with the initial size (1MiB usuable size),
         and add 32768 copies of 28-byte structs (which will exactly hit the maximum size (including 4-byte tag)).
@@ -160,6 +161,7 @@ pub fn wasmtest<C: TestContext>(c: &mut C) {
             mem,
             0,
             MEM_INITIAL_HEAP_SIZE,
+            error_func,
             wasm_module,
         );
 

static-wasmtest/index.js

@@ -27,10 +27,15 @@ async function run() {
     let test_index = 0;
     let num_asserts = 0;
     for (const binary of binaries) {
-        const imports = { platform: {
-            assert_fail: (l, r, n) => { alert("Assertion " + (n+1) + " failed on test " + (test_index+1) + ": " + l + "==" + r); throw ""; },
-            test_fail: () => { alert("Test failed on test " + (test_index+1) + "."); throw ""; },
-        } };
+        const imports = {
+            platform: {
+                assert_fail: (l, r, n) => { alert("Assertion " + (n+1) + " failed on test " + (test_index+1) + ": " + l + "==" + r); throw ""; },
+                test_fail: () => { alert("Test failed on test " + (test_index+1) + "."); throw ""; },
+            }, core: {
+                error: (e, a, i, l, c) => { alert("Error code " + e + " raised"); throw ""; },
+                test_fail: () => { alert("Test failed on test " + (test_index+1) + "."); throw ""; },
+            }
+        };
         const instance = await load_binary(binary, imports);
         const result = instance.main();
         ++test_index;

wasm-test-harness/src/lib.rs

@@ -21,7 +21,7 @@ extern "C" {
 }
 
 pub trait TestContext {
-    fn add_test<F: FnOnce(&mut CodeBuilder, &mut WasmModule, &NormalTester)>(
+    fn add_test<F: FnOnce(&mut CodeBuilder, &mut WasmModule, wasmgen::FuncIdx, &NormalTester)>(
         &mut self,
         name_: &str,
         f: F,
@@ -80,7 +80,7 @@ impl<A: Fn(Box<[u8]>) -> ()> TestContext for NormalContext<A> {
     `f` should emit code that has net wasm stack [] -> [], even though the CodeBuilder might have a different signature.  This is because the test harness might return different bookkeeping information.
     It should not emit the end() instruction to end the function.
     */
-    fn add_test<F: FnOnce(&mut CodeBuilder, &mut WasmModule, &NormalTester)>(
+    fn add_test<F: FnOnce(&mut CodeBuilder, &mut WasmModule, wasmgen::FuncIdx, &NormalTester)>(
         &mut self,
         name_: &str,
         f: F,
@@ -101,6 +101,21 @@ impl<A: Fn(Box<[u8]>) -> ()> TestContext for NormalContext<A> {
             "test_fail".to_string(),
             &FuncType::new(Box::new([]), Box::new([])),
         );
+        // generate the error function
+        let error_func: wasmgen::FuncIdx = wasm_builder.import_func(
+            "core".to_string(),
+            "error".to_string(),
+            &wasmgen::FuncType::new(
+                Box::new([
+                    wasmgen::ValType::I32,
+                    wasmgen::ValType::I32,
+                    wasmgen::ValType::I32,
+                    wasmgen::ValType::I32,
+                    wasmgen::ValType::I32,
+                ]),
+                Box::new([]),
+            ),
+        );
         let mut wasm_module = wasm_builder.build();
         let globalidx_assert_count = wasm_module.add_i32_global(Mut::Var, 0);
 
@@ -115,7 +130,7 @@ impl<A: Fn(Box<[u8]>) -> ()> TestContext for NormalContext<A> {
         };
 
         // net wasm stack: [] -> []
-        f(&mut code_builder, &mut wasm_module, &tester);
+        f(&mut code_builder, &mut wasm_module, error_func, &tester);
 
         // net wasm stack: [] -> [ret(i32)]
         {