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

test/mjsunit/wasm/compiled-module-serialization.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 --allow-natives-syntax --expose-gc
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 (function SerializeAndDeserializeModule() {
   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 32 matching lines @@
 
 (function DeserializeInvalidObject() {
   var invalid_buffer = new ArrayBuffer(10);
 
   module = %DeserializeWasmModule(invalid_buffer);
   assertEquals(module, undefined);
 })();
 
 (function RelationBetweenModuleAndClone() {
   let builder = new WasmModuleBuilder();
-  builder.addFunction("main", kSig_i_v)
+  builder.addFunction("main", kSig_i)
     .addBody([kExprI8Const, 42])
     .exportFunc();
 
   var compiled_module = new WebAssembly.Module(builder.toBuffer());
   var serialized = %SerializeWasmModule(compiled_module);
   var clone = %DeserializeWasmModule(serialized);
 
   assertNotNull(clone);
   assertFalse(clone == undefined);
   assertFalse(clone == compiled_module);
   assertEquals(clone.constructor, compiled_module.constructor);
 })();
 
 (function SerializeAfterInstantiation() {
   let builder = new WasmModuleBuilder();
-  builder.addFunction("main", kSig_i_v)
+  builder.addFunction("main", kSig_i)
     .addBody([kExprI8Const, 42])
     .exportFunc();
 
   var compiled_module = new WebAssembly.Module(builder.toBuffer());
   var instance1 = new WebAssembly.Instance(compiled_module);
   var instance2 = new WebAssembly.Instance(compiled_module);
   var serialized = %SerializeWasmModule(compiled_module);
   var clone = %DeserializeWasmModule(serialized);
 
   assertNotNull(clone);
   assertFalse(clone == undefined);
   assertFalse(clone == compiled_module);
   assertEquals(clone.constructor, compiled_module.constructor);
   var instance3 = new WebAssembly.Instance(clone);
   assertFalse(instance3 == undefined);
 })();