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

test/mjsunit/wasm/asm-wasm-switch.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 assertValidAsm(func) {
+  assertTrue(%IsAsmWasmCode(func));
+}
 
 (function TestSwitch0() {
   function asmModule() {
     "use asm"
 
     function caller() {
       var ret = 0;
       var x = 7;
       switch (x|0) {
         case 1: {
           return 0;
         }
         case 7: {
           ret = 5;
           break;
         }
         default: return 0;
       }
       return ret|0;
     }
 
     return {caller:caller};
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(5, wasm.caller());
 })();
 
 (function TestSwitch() {
   function asmModule() {
     "use asm"
 
     function caller() {
       var ret = 0;
       var x = 7;
       switch (x|0) {
         case 1: return 0;
         case 7: {
           ret = 12;
           break;
         }
         default: return 0;
       }
       switch (x|0) {
         case 1: return 0;
         case 8: return 0;
         default: ret = (ret + 11)|0;
       }
       return ret|0;
     }
 
     return {caller:caller};
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(23, wasm.caller());
 })();
 
 (function TestSwitchFallthrough() {
   function asmModule() {
     "use asm"
 
     function caller() {
       var x = 17;
       var ret = 0;
       switch (x|0) {
         case 17:
         case 14: ret = 39;
         case 1: ret = (ret + 3)|0;
         case 4: break;
         default: ret = (ret + 1)|0;
       }
       return ret|0;
     }
 
     return {caller:caller};
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(42, wasm.caller());
 })();
 
 (function TestNestedSwitch() {
   function asmModule() {
     "use asm"
 
     function caller() {
       var x = 3;
       var y = -13;
       switch (x|0) {
         case 1: return 0;
         case 3: {
           switch (y|0) {
             case 2: return 0;
             case -13: return 43;
             default: return 0;
           }
         }
         default: return 0;
       }
       return 0;
     }
 
     return {caller:caller};
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(43, wasm.caller());
 })();
 
 (function TestSwitchWithDefaultOnly() {
   function asmModule() {
     "use asm";
     function main(x) {
       x = x|0;
       switch(x|0) {
         default: return -10;
       }
       return 0;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(-10, wasm.main(2));
   assertEquals(-10, wasm.main(54));
 })();
 
 (function TestEmptySwitch() {
   function asmModule() {
     "use asm";
     function main(x) {
       x = x|0;
       switch(x|0) {
       }
       return 73;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(73, wasm.main(7));
 })();
 
 (function TestSwitchWithBrTable() {
   function asmModule() {
     "use asm";
     function main(x) {
       x = x|0;
       switch(x|0) {
         case 14: return 23;
         case 12: return 25;
         case 15: return 29;
         case 19: return 34;
         case 18: return 17;
         case 16: return 16;
         default: return -1;
       }
       return 0;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(25, wasm.main(12));
   assertEquals(23, wasm.main(14));
   assertEquals(29, wasm.main(15));
   assertEquals(16, wasm.main(16));
   assertEquals(17, wasm.main(18));
   assertEquals(34, wasm.main(19));
   assertEquals(-1, wasm.main(-1));
 })();
 
 (function TestSwitchWithBalancedTree() {
   function asmModule() {
     "use asm";
     function main(x) {
       x = x|0;
       switch(x|0) {
         case 5: return 52;
         case 1: return 11;
         case 6: return 63;
         case 9: return 19;
         case -4: return -4;
       }
       return 0;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(-4, wasm.main(-4));
   assertEquals(11, wasm.main(1));
   assertEquals(52, wasm.main(5));
   assertEquals(63, wasm.main(6));
   assertEquals(19, wasm.main(9));
   assertEquals(0, wasm.main(11));
 })();
 
 (function TestSwitchHybrid() {
   function asmModule() {
@@ skipping 12 matching lines @@
         case 13: return 31;
         case 16: return 16;
         default: return -1;
       }
       return 0;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(-4, wasm.main(1));
   assertEquals(23, wasm.main(2));
   assertEquals(32, wasm.main(3));
   assertEquals(14, wasm.main(4));
   assertEquals(17, wasm.main(7));
   assertEquals(10, wasm.main(10));
   assertEquals(121, wasm.main(11));
   assertEquals(112, wasm.main(12));
   assertEquals(31, wasm.main(13));
   assertEquals(16, wasm.main(16));
@@ skipping 26 matching lines @@
           ret = 10;
           break;
         }
       }
       return ret|0;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(12, wasm.main(2));
   assertEquals(10, wasm.main(10));
   assertEquals(54, wasm.main(3));
 })();
 
 (function TestSwitchFallthroughHybrid() {
   function asmModule() {
     "use asm";
     function main(x) {
       x = x|0;
@@ skipping 40 matching lines @@
           ret = -1;
           break;
         }
       }
       return ret|0;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(7, wasm.main(4));
   assertEquals(16, wasm.main(10));
   assertEquals(-1, wasm.main(19));
   assertEquals(-1, wasm.main(23));
 })();
 
 (function TestSwitchHybridWithNoDefault() {
   function asmModule() {
     "use asm";
     function main(x) {
@@ skipping 20 matching lines @@
           ret = 7;
           break;
         }
       }
       return ret|0;
     }
     return {
       main: main,
     };
   }
-  var wasm = Wasm.instantiateModuleFromAsm(asmModule.toString());
+  var wasm = asmModule();
+  assertValidAsm(asmModule);
   assertEquals(2, wasm.main(2));
   assertEquals(7, wasm.main(7));
   assertEquals(19, wasm.main(-1));
 })();
 
 (function TestLargeSwitch() {
   function LargeSwitchGenerator(begin, end, gap, handle_case) {
     var str = "function asmModule() {\
       \"use asm\";\
       function main(x) {\
         x = x|0;\
         switch(x|0) {";
     for (var i = begin; i <= end; i = i + gap) {
       str = str.concat("case ", i.toString(), ": ", handle_case(i));
     }
     str = str.concat("default: return -1;\
         }\
         return -2;\
       }\
       return {main: main}; }");
 
-    var wasm = Wasm.instantiateModuleFromAsm(str);
+    var decl = eval('(' + str + ')');
+    var wasm = decl();
+    assertValidAsm(decl);
     return wasm;
   }
 
   var handle_case = function(k) {
     return "return ".concat(k, ";");
   }
   var wasm = LargeSwitchGenerator(0, 513, 1, handle_case);
   for (var i = 0; i <= 513; i++) {
     assertEquals(i, wasm.main(i));
   }
@@ skipping 48 matching lines @@
     if (k != 56) return "break;";
     else return "return 23;";
   }
   wasm = LargeSwitchGenerator(0, 638, 2, handle_case);
   for (var i = 0; i <= 638; i = i + 2) {
     if (i == 56) assertEquals(23, wasm.main(i));
     else assertEquals(-2, wasm.main(i));
   }
   assertEquals(-1, wasm.main(-1));
 })();