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

test/mjsunit/wasm/asm-wasm-i32.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
 
 function WrapInAsmModule(func) {
   function MODULE_NAME(stdlib) {
     "use asm";
     var imul = stdlib.Math.imul;
     var Math_max = stdlib.Math.max;
     var Math_min = stdlib.Math.min;
     var Math_abs = stdlib.Math.abs;
 
     FUNC_BODY
     return {main: FUNC_NAME};
   }
 
   var source = MODULE_NAME.toString()
     .replace(/MODULE_NAME/g, func.name + "_module")
     .replace(/FUNC_BODY/g, func.toString())
     .replace(/FUNC_NAME/g, func.name);
   return eval("(" + source + ")");
 }
 
-function RunThreeWayTest(asmfunc, expect) {
+function RunAsmJsTest(asmfunc, expect) {
   var asm_source = asmfunc.toString();
   var nonasm_source = asm_source.replace(new RegExp("use asm"), "");
   var stdlib = {Math: Math};
 
+  print("Testing " + asmfunc.name + " (js)...");
   var js_module = eval("(" + nonasm_source + ")")(stdlib);
-  print("Testing " + asmfunc.name + " (js)...");
   expect(js_module);
 
   print("Testing " + asmfunc.name + " (asm.js)...");
   var asm_module = asmfunc(stdlib);
+  assertTrue(%IsAsmWasmCode(asmfunc));
   expect(asm_module);
-
-  print("Testing " + asmfunc.name + " (wasm)...");
-  var wasm_module = Wasm.instantiateModuleFromAsm(asm_source, stdlib);
-  expect(wasm_module);
 }
 
 const imul = Math.imul;
 const Math_max = Math.max;
 const Math_min = Math.min;
 const Math_abs = Math.abs;
 
 function i32_add(a, b) {
   a = a | 0;
   b = b | 0;
@@ skipping 175 matching lines @@
   i32_lteq,
   i32_gt,
   i32_gteq,
   i32_min,
   i32_max,
   i32_abs
 ];
 
 (function () {
   for (func of funcs) {
-    RunThreeWayTest(WrapInAsmModule(func), function (module) {
+    RunAsmJsTest(WrapInAsmModule(func), function (module) {
       if (func.length == 1) {
         for (a of inputs) {
           assertEquals(func(a), module.main(a));
         }
       } else {
         for (a of inputs) {
           for (b of inputs) {
             assertEquals(func(a, b), module.main(a, b));
           }
         }
       }
     });
   }
 
 })();