[wasm] asm.js - Remove Wasm.instantiateModuleFromAsm, use asm.js directly.

test/mjsunit/asm/asm-validation.js

Index: test/mjsunit/asm/asm-validation.js
diff --git a/test/mjsunit/asm/asm-validation.js b/test/mjsunit/asm/asm-validation.js
index 5996b076772655cbbd8f36dbb7ae0f2f8152c807..240600f7ef3fd96af2449e38809bfff787f83933 100644
--- a/test/mjsunit/asm/asm-validation.js
+++ b/test/mjsunit/asm/asm-validation.js
@@ -4,8 +4,9 @@
 
 // Flags: --validate-asm --allow-natives-syntax
 
-function IsAlwaysOpt(module) {
-  return %GetOptimizationStatus(module) === 3;
+function assertValidAsm(func) {
+  assertTrue(%IsAsmWasmCode(func) ||
+             %GetOptimizationStatus(func) === 3);
 }
 
 (function TestModuleArgs() {
@@ -29,15 +30,16 @@ function IsAlwaysOpt(module) {
   for (var i = 0; i < modules.length; ++i) {
     print('Module' + (i + 1));
     var module = modules[i];
-    // TODO(bradnelson): Support modules without the stdlib.
+    var m = module();
+    assertValidAsm(module);
     var m = module({});
-    assertTrue(%IsAsmWasmCode(module) || IsAlwaysOpt(module));
+    assertValidAsm(module);
     var m = module({}, {});
-    assertTrue(%IsAsmWasmCode(module) || IsAlwaysOpt(module));
+    assertValidAsm(module);
     var m = module({}, {}, heap);
-    assertTrue(%IsAsmWasmCode(module) || IsAlwaysOpt(module));
+    assertValidAsm(module);
     var m = module({}, {}, heap, {});
-    assertTrue(%IsAsmWasmCode(module) || IsAlwaysOpt(module));
+    assertValidAsm(module);
   }
 })();
 
@@ -55,6 +57,7 @@ function IsAlwaysOpt(module) {
 (function TestBadArgTypes() {
   function Module(a, b, c) {
     "use asm";
+    var NaN = a.NaN;
     return {};
   }
   var m = Module(1, 2, 3);
@@ -65,6 +68,7 @@ function IsAlwaysOpt(module) {
 (function TestBadArgTypesMismatch() {
   function Module(a, b, c) {
     "use asm";
+    var NaN = a.NaN;
     return {};
   }
   var m = Module(1, 2);
@@ -73,15 +77,13 @@ function IsAlwaysOpt(module) {
 })();
 
 (function TestModuleNoStdlib() {
-  // TODO(bradnelson):
-  // Support modules like this if they don't use the whole stdlib.
   function Module() {
     "use asm";
     function foo() { return 123; }
     return { foo: foo };
   }
   var m = Module({});
-  assertFalse(%IsAsmWasmCode(Module));
+  assertValidAsm(Module);
   assertEquals(123, m.foo());
 })();
 
@@ -103,9 +105,8 @@ function IsAlwaysOpt(module) {
     function foo() { return 123; }
     return { foo: foo };
   }
-  // TODO(bradnelson): Support instantiation like this if stdlib is unused.
   var m = Module();
-  assertFalse(%IsAsmWasmCode(Module));
+  assertValidAsm(Module);
   assertEquals(123, m.foo());
 })();
 
@@ -116,13 +117,14 @@ function IsAlwaysOpt(module) {
     return { foo: foo };
   }
   var m = new Module({}, {});
-  assertTrue(%IsAsmWasmCode(Module) || IsAlwaysOpt(Module));
+  assertValidAsm(Module);
   assertEquals(123, m.foo());
 })();
 
 (function TestMultipleFailures() {
   function Module(stdlib) {
     "use asm";
+    var NaN = stdlib.NaN;
     function foo() { return 123; }
     return { foo: foo };
   }
@@ -138,6 +140,7 @@ function IsAlwaysOpt(module) {
   function MkModule() {
     function Module(stdlib, ffi, heap) {
       "use asm";
+      var NaN = stdlib.NaN;
       function foo() { return 123; }
       return { foo: foo };
     }
@@ -158,6 +161,7 @@ function IsAlwaysOpt(module) {
   function MkModule() {
     function Module(stdlib, ffi, heap) {
       "use asm";
+      var NaN = stdlib.NaN;
       function foo() { return 123; }
       return { foo: foo };
     }
@@ -166,8 +170,8 @@ function IsAlwaysOpt(module) {
   var Module1 = MkModule();
   var Module2 = MkModule();
   var heap = new ArrayBuffer(1024 * 1024);
-  var m1 = Module1({}, {}, heap);
-  assertTrue(%IsAsmWasmCode(Module1) || IsAlwaysOpt(Module1));
+  var m1 = Module1({NaN: NaN}, {}, heap);
+  assertValidAsm(Module1);
   var m2 = Module2(1, 2, 3);
   assertFalse(%IsAsmWasmCode(Module2));
   assertEquals(123, m1.foo());
@@ -178,6 +182,7 @@ function IsAlwaysOpt(module) {
   function MkModule() {
     function Module(stdlib, ffi, heap) {
       "use asm";
+      var NaN = stdlib.NaN;
       function foo() { return 123; }
       return { foo: foo };
     }
@@ -186,11 +191,11 @@ function IsAlwaysOpt(module) {
   var Module1 = MkModule();
   var Module2 = MkModule();
   var heap = new ArrayBuffer(1024 * 1024);
-  var m1a = Module1({}, {}, heap);
-  assertTrue(%IsAsmWasmCode(Module1) || IsAlwaysOpt(Module1));
+  var m1a = Module1({NaN: NaN}, {}, heap);
+  assertValidAsm(Module1);
   var m2 = Module2(1, 2, 3);
   assertFalse(%IsAsmWasmCode(Module2));
-  var m1b = Module1({}, {}, heap);
+  var m1b = Module1({NaN: NaN}, {}, heap);
   assertFalse(%IsAsmWasmCode(Module1));
   assertEquals(123, m1a.foo());
   assertEquals(123, m1b.foo());
@@ -206,6 +211,6 @@ function IsAlwaysOpt(module) {
   var heap = new ArrayBuffer(1024 * 1024);
   var ModuleBound = Module.bind(this, {}, {}, heap);
   var m = ModuleBound();
-  assertTrue(%IsAsmWasmCode(Module) || IsAlwaysOpt(Module));
+  assertValidAsm(Module);
   assertEquals(123, m.foo());
 })();