Revert of [wasm] Refactor import handling for 0xC.

test/mjsunit/wasm/instantiate-module-basic.js

 // Copyright 2015 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
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 let kReturnValue = 117;
 
 let buffer = (() => {
   let builder = new WasmModuleBuilder();
   builder.addMemory(1, 1, true);
-  builder.addFunction("main", kSig_i_v)
+  builder.addFunction("main", kSig_i)
     .addBody([kExprI8Const, kReturnValue])
     .exportFunc();
 
   return builder.toBuffer();
 })()
 
 function CheckInstance(instance) {
   assertFalse(instance === undefined);
   assertFalse(instance === null);
   assertFalse(instance === 0);
@@ skipping 86 matching lines @@
     assertTrue(instance_1 != instance_2);
   });
 })();
 
 (function InstancesAreIsolatedFromEachother() {
   print("InstancesAreIsolatedFromEachother...");
   var builder = new WasmModuleBuilder();
   builder.addMemory(1,1, true);
   var kSig_v_i = makeSig([kAstI32], []);
   var signature = builder.addType(kSig_v_i);
-  builder.addImport("some_value", kSig_i_v);
+  builder.addImport("some_value", kSig_i);
   builder.addImport("writer", signature);
 
   builder.addFunction("main", kSig_i_i)
     .addBody([
       kExprGetLocal, 0,
       kExprI32LoadMem, 0, 0,
       kExprI32Const, 1,
       kExprCallIndirect, signature,
       kExprGetLocal,0,
       kExprI32LoadMem,0, 0,
@@ skipping 29 matching lines @@
   assertEquals(43, i1.exports.main(0));
   assertEquals(1002, i2.exports.main(0));
 
   assertEquals(42, outval_1);
   assertEquals(1000, outval_2);
 })();
 
 (function GlobalsArePrivateToTheInstance() {
   print("GlobalsArePrivateToTheInstance...");
     var builder = new WasmModuleBuilder();
-    builder.addGlobal(kAstI32, true);
+    builder.addGlobal(kAstI32);
     builder.addFunction("read", kSig_i_v)
         .addBody([
             kExprGetGlobal, 0])
         .exportFunc();
 
     builder.addFunction("write", kSig_v_i)
         .addBody([
             kExprGetLocal, 0,
             kExprSetGlobal, 0])
         .exportFunc();
 
     var module = new WebAssembly.Module(builder.toBuffer());
     var i1 = new WebAssembly.Instance(module);
     var i2 = new WebAssembly.Instance(module);
     i1.exports.write(1);
     i2.exports.write(2);
     assertEquals(1, i1.exports.read());
     assertEquals(2, i2.exports.read());
 })();
 
 
 (function InstanceMemoryIsIsolated() {
   print("InstanceMemoryIsIsolated...");
   var builder = new WasmModuleBuilder();
   builder.addMemory(1,1, true);
 
-  builder.addFunction("f", kSig_i_v)
+  builder.addFunction("f", kSig_i)
     .addBody([
       kExprI32Const, 0,
       kExprI32LoadMem, 0, 0
     ]).exportFunc();
 
   var mem_1 = new ArrayBuffer(65536);
   var mem_2 = new ArrayBuffer(65536);
   var view_1 = new Int32Array(mem_1);
   var view_2 = new Int32Array(mem_2);
   view_1[0] = 1;
   view_2[0] = 1000;
 
   var module = new WebAssembly.Module(builder.toBuffer());
   var i1 = new WebAssembly.Instance(module, null, mem_1);
   var i2 = new WebAssembly.Instance(module, null, mem_2);
 
   assertEquals(1, i1.exports.f());
   assertEquals(1000, i2.exports.f());
 })();