3 files changed, 60 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/wasm/js-types/directives.txt b/js/src/jit-test/tests/wasm/js-types/directives.txt
new file mode 100644
index 0000000000..01f722ba1e
--- /dev/null
+++ b/js/src/jit-test/tests/wasm/js-types/directives.txt
@@ -0,0 +1 @@
+|jit-test| include:wasm.js
diff --git a/js/src/jit-test/tests/wasm/js-types/function-ctor-callable.js b/js/src/jit-test/tests/wasm/js-types/function-ctor-callable.js
new file mode 100644
index 0000000000..d99a64eaf7
--- /dev/null
+++ b/js/src/jit-test/tests/wasm/js-types/function-ctor-callable.js
@@ -0,0 +1,33 @@
+// |jit-test| skip-if: !('Function' in WebAssembly)
+
+load(libdir + "asserts.js");
+
+function testWasmFunc(f, arg, rval) {
+    var func = new WebAssembly.Function({parameters: ["i32"], results: ["i32"]}, f);
+    assertEq(func instanceof WebAssembly.Function, true);
+    assertEq(func(arg), rval);
+}
+
+let f = n => n + 5;
+
+// Callable objects.
+testWasmFunc(f, 1, 6);
+testWasmFunc(f.bind(null), 2, 7);
+testWasmFunc(f.bind(null, 9), 2, 14);
+testWasmFunc(new Proxy(f, {}), 3, 8);
+testWasmFunc(new Proxy(f, {apply() { return 123; }}), 3, 123);
+
+// Cross-realm but same-compartment function.
+let global1 = newGlobal({sameCompartmentAs: this});
+global1.evaluate("function f(n) { return n + 8; }");
+testWasmFunc(global1.f, 1, 9);
+
+// Non-callable values.
+assertErrorMessage(() => testWasmFunc({}, 1, 6), TypeError, /must be a function/);
+assertErrorMessage(() => testWasmFunc(null, 1, 6), TypeError, /must be a function/);
+assertErrorMessage(() => testWasmFunc("", 1, 6), TypeError, /must be a function/);
+
+// Cross-compartment wrappers are not supported yet. See IsCallableNonCCW.
+let global2 = newGlobal({newCompartment: true});
+global2.evaluate("function f() {}");
+assertErrorMessage(() => testWasmFunc(global2.f, 1, 6), TypeError, /must be a function/);
diff --git a/js/src/jit-test/tests/wasm/js-types/table-js-funcs.js b/js/src/jit-test/tests/wasm/js-types/table-js-funcs.js
new file mode 100644
index 0000000000..92b6c462ef
--- /dev/null
+++ b/js/src/jit-test/tests/wasm/js-types/table-js-funcs.js
@@ -0,0 +1,26 @@
+// |jit-test| skip-if: !('Function' in WebAssembly)
+
+function testfunc(n) {}
+
+const table = new WebAssembly.Table({element: "anyfunc", initial: 3});
+const func1 = new WebAssembly.Function({parameters: ["i32"], results: []}, testfunc);
+table.set(0, func1);
+const func2 = new WebAssembly.Function({parameters: ["f32"], results: []}, testfunc);
+table.set(1, func2);
+const func3 = new WebAssembly.Function({parameters: ["i64"], results: []}, testfunc);
+table.set(2, func3);
+
+const first = table.get(0);
+assertEq(first instanceof WebAssembly.Function, true);
+assertEq(first, func1);
+assertEq(first.type().parameters[0], func1.type().parameters[0]);
+
+const second = table.get(1);
+assertEq(second instanceof WebAssembly.Function, true);
+assertEq(second, func2);
+assertEq(second.type().parameters[0], func2.type().parameters[0]);
+
+const third = table.get(2);
+assertEq(third instanceof WebAssembly.Function, true);
+assertEq(third, func3);
+assertEq(third.type().parameters[0], func3.type().parameters[0]);