Bug 1308056: wasm: enable a few spec test cases; r=luke

MozReview-Commit-ID: AmK8iNrkMTr

--HG--
extra : rebase_source : 7b245179dea5b4fbee7cbb9a7f033dbf8035842f

js/src/jit-test/tests/wasm/spec.js

@@ -45,8 +45,6 @@ Element.prototype.toString = function() {
     return `(${this.list.map(x => x.toString()).join(" ")})`;
 };
 
-var module;
-
 setJitCompilerOption('wasm.test-mode', 1);
 
 // Creates a tree of s-expressions. Ported from Binaryen's SExpressionParser.
@@ -194,9 +192,10 @@ function parseSExpression(text) {
 
 var imports = {
     spectest: {
-        print: function (x) {
-            print(x);
-        }
+        print,
+        global: 666,
+        table: new WebAssembly.Table({ initial: 10, maximum: 20, element: "anyfunc" }),
+        memory: new WebAssembly.Memory({ initial: 1, maximum: 2 }),
     }
 };
 
@@ -259,6 +258,29 @@ function testNaNEqualityFunction() {
 }
 
 var constantCache = new Map;
+var moduleCache = new Map;
+
+function getModuleAndField(e) {
+    let nextArgIndex = 1;
+    let nameExpr = e.list[nextArgIndex];
+    let name = nameExpr.str;
+
+    let moduleName = '__last_module__';
+    if (nameExpr.dollared && !nameExpr.quoted) {
+        moduleName = name;
+        nextArgIndex += 1;
+    }
+
+    if (!moduleCache.has(moduleName)) {
+        throw new Error('We should have a module here before trying to invoke things!');
+    }
+
+    let module = moduleCache.get(moduleName);
+    let fieldName = e.list[nextArgIndex++].str;
+    let rest = e.list.slice(nextArgIndex).map(exec);
+
+    return [module, fieldName, rest];
+}
 
 // Recursively execute the expression.
 function exec(e) {
@@ -266,27 +288,40 @@ function exec(e) {
 
     if (exprName === "module") {
         let moduleText = e.toString();
-        module = wasmEvalText(moduleText, imports).exports;
+
+        let moduleName = null;
+        if (e.list && e.list.length >= 2 && e.list[1].str && e.list[1].dollared) {
+            moduleName = e.list[1].str;
+            moduleText = moduleText.replace(`$${moduleName}`, '');
+        }
+
+        let module = wasmEvalText(moduleText, imports).exports;
+        moduleCache.set('__last_module__', module);
+        if (moduleName) {
+            moduleCache.set(moduleName, module);
+        }
+
         return;
     }
 
     if (exprName === "invoke") {
-        var name = e.list[1].str;
-        var args = e.list.slice(2).map(exec);
-        var fn = null;
+        let [module, field, args] = getModuleAndField(e);
 
-        if (module === null) {
-            throw new Error('We should have a module here before trying to invoke things!');
-        }
-
-        if (typeof module[name] === "function") {
-            fn = module[name];
+        let fn = null;
+        if (typeof module[field] === "function") {
+            fn = module[field];
         } else {
-            assert(false, "Exported function not found: " + e);
+            throw new Error("Exported function not found: " + e);
         }
+
         return fn.apply(null, args);
     }
 
+    if (exprName === "get") {
+        let [module, field, args] = getModuleAndField(e);
+        return module[field];
+    }
+
     if (exprName.indexOf(".const") > 0) {
         // Eval the expression using a wasm module.
         var type = exprName.substring(0, exprName.indexOf(".const"));
@@ -375,6 +410,26 @@ function exec(e) {
         return;
     }
 
+    if (exprName === 'assert_unlinkable') {
+        let moduleText = e.list[1].toString();
+        let errMsg = e.list[2];
+        if (errMsg) {
+            assert(errMsg.quoted, "assert_invalid second argument must be a string");
+            errMsg.quoted = false;
+        }
+        let module = new WebAssembly.Module(wasmTextToBinary(moduleText));
+        let caught = false;
+        try {
+            new WebAssembly.Instance(module, imports);
+        } catch(err) {
+            caught = true;
+            if (err.toString().indexOf(errMsg) === -1)
+                warn(`expected error message "${errMsg}", got "${err}"`);
+        }
+        assert(caught, "assert_unlinkable exception not caught");
+        return;
+    }
+
     if (!handleNonStandard(exprName, e)) {
         assert(false, "NYI: " + e);
     }

js/src/jit-test/tests/wasm/spec/br.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['br.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/br_table.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['br_table.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/call_indirect.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['call_indirect.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/exports.wast.js

@@ -1,5 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: module names
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['exports.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/func.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['func.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/func_ptrs.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['func_ptrs.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/globals.wast.js

@@ -0,0 +1,2 @@
+// |jit-test| test-also-wasm-baseline
+var importedArgs = ['globals.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/imports.wast

@@ -77,16 +77,18 @@
 (assert_return (invoke "get-x") (i32.const 666))
 (assert_return (invoke "get-y") (i32.const 666))
 
-(assert_unlinkable
-  (module (import "spectest" "unknown" (global i32)))
-  "unknown import"
-)
-(assert_unlinkable
-  (module (import "spectest" "print" (global i32)))
-  "type mismatch"
-)
+;; TODO; Tests not adapted for a JS host!
+;;(assert_unlinkable
+;;  (module (import "spectest" "unknown" (global i32)))
+;;  "unknown import"
+;;)
+;;(assert_unlinkable
+;;  (module (import "spectest" "print" (global i32)))
+;;  "type mismatch"
+;;)
 
-(module (import "spectest" "global" (global i64)))
+;; TODO;
+;;(module (import "spectest" "global" (global i64)))
 (module (import "spectest" "global" (global f32)))
 (module (import "spectest" "global" (global f64)))
 

js/src/jit-test/tests/wasm/spec/imports.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['imports.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/left-to-right.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['left-to-right.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/return.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['return.wast']; load(scriptdir + '../spec.js');

js/src/jit-test/tests/wasm/spec/unreachable.wast.js

@@ -1,4 +1,2 @@
 // |jit-test| test-also-wasm-baseline
-// TODO: new anyfunc table syntax
-quit();
 var importedArgs = ['unreachable.wast']; load(scriptdir + '../spec.js');