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

test/mjsunit/wasm/asm-wasm-stdlib.js

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --expose-wasm
+// Flags: --validate-asm --allow-natives-syntax
 
 var stdlib = this;
 
+function assertValidAsm(func) {
+  assertTrue(%IsAsmWasmCode(func));
+}
+
 (function TestStdlibConstants() {
   function Module(stdlib) {
     "use asm";
 
     var StdlibInfinity = stdlib.Infinity;
     var StdlibNaN = stdlib.NaN;
     var StdlibMathE = stdlib.Math.E;
     var StdlibMathLN10 = stdlib.Math.LN10;
     var StdlibMathLN2 = stdlib.Math.LN2;
     var StdlibMathLOG2E = stdlib.Math.LOG2E;
@@ skipping 15 matching lines @@
       return 1;
     }
 
     function nanCheck() {
       return +StdlibNaN;
     }
 
     return {caller:caller, nanCheck:nanCheck};
   }
 
-  var m = Wasm.instantiateModuleFromAsm(Module.toString(), stdlib);
+  var m = Module(stdlib);
+  assertValidAsm(Module);
   assertEquals(1, m.caller());
   assertTrue(isNaN(m.nanCheck()));
 })();
 
 
 var stdlib = this;
 var stdlib_root_members = [
   'Infinity',
   'NaN',
 ];
@@ skipping 33 matching lines @@
     "use asm";
     var foo = stdlib.NaN;
     return {};
   }
   for (var i = 0; i < stdlib_root_members.length; ++i) {
     var member = stdlib_root_members[i];
     var stdlib = {};
     stdlib[member] = 0;
     print(member);
     var code = Module.toString().replace('NaN', member);
-    assertThrows(function() {
-      Wasm.instantiateModuleFromAsm(code, stdlib);
-    });
+    var decl = eval('(' + code + ')');
+    decl(stdlib);
+    assertTrue(%IsNotAsmWasmCode(decl));
   }
   for (var i = 0; i < stdlib_math_members.length; ++i) {
     var member = stdlib_math_members[i];
     var stdlib = {Math:{}};
     stdlib['Math'][member] = 0;
     print(member);
     var code = Module.toString().replace('NaN', 'Math.' + member);
-    assertThrows(function() {
-      Wasm.instantiateModuleFromAsm(code, stdlib);
-    });
+    var decl = eval('(' + code + ')');
+    decl(stdlib);
+    assertTrue(%IsNotAsmWasmCode(decl));
   }
 })();
 
 
 (function TestMissingNaNStdlib() {
   function Module(stdlib) {
     "use asm";
     var foo = stdlib.NaN;
     return {};
   }
   for (var i = 0; i < stdlib_root_members.length; ++i) {
     var member = stdlib_root_members[i];
     var code = Module.toString().replace('NaN', member);
-    assertThrows(function() {
-      Wasm.instantiateModuleFromAsm(code, {});
-    });
+    var decl = eval('(' + code + ')');
+    decl({});
+    assertTrue(%IsNotAsmWasmCode(decl));
   }
   for (var i = 0; i < stdlib_math_members.length; ++i) {
     var member = stdlib_math_members[i];
     var code = Module.toString().replace('NaN', 'Math.' + member);
+    var decl = eval('(' + code + ')');
     assertThrows(function() {
-      Wasm.instantiateModuleFromAsm(code, {});
+      decl({});
+      assertTrue(%IsNotAsmWasmCode(decl));
     });
   }
 })();
 
 
 (function TestStdlibFunctionsInside() {
   function Module(stdlib) {
     "use asm";
 
     var StdlibMathCeil = stdlib.Math.ceil;
@@ skipping 60 matching lines @@
       if (!(deltaEqual(+StdlibMathAtan2(6.0, 7.0), 0.7086262721276703)|0))
         return 0;
       if (+StdlibMathPow(6.0, 7.0) != 279936.0) return 0;
 
       return 1;
     }
 
     return {caller:caller};
   }
 
-  var m = Wasm.instantiateModuleFromAsm(Module.toString(), stdlib);
+  var m = Module(stdlib);
+  assertValidAsm(Module);
   assertEquals(1, m.caller());
 })();
 
 
 (function TestStdlibFunctionOutside() {
   function looseEqual(x, y, delta) {
     if (delta === undefined) {
       delta = 1.0e-10;
     }
     if (isNaN(x) && isNaN(y)) {
@@ skipping 123 matching lines @@
       fround2_f32: fround2_f32,
       fround2_f64: fround2_f64,
       min_i32: min_i32,
       min_f32: min_f32,
       min_f64: min_f64,
       max_i32: max_i32,
       max_f32: max_f32,
       max_f64: max_f64,
     };
   }
-  var m = Wasm.instantiateModuleFromAsm(Module.toString(), stdlib);
+  var m = Module(stdlib);
+  assertValidAsm(Module);
   var values = {
     i32: [
       0, 1, -1, 123, 456, -123, -456,
       0x40000000, 0x7FFFFFFF, -0x80000000,
     ],
     u32: [
       0, 1, 123, 456,
       0x40000000, 0x7FFFFFFF, 0xFFFFFFFF, 0x80000000,
     ],
     f32: [
@@ skipping 74 matching lines @@
           if (!compare(expected, actual)) {
             print(expected + ' !== ' + actual + ' for ' + name +
                   ' with input ' + val0 + ' ' + val1);
             assertTrue(false);
           }
         }
       }
     }
   }
 })();