Refactor module builder

test/mjsunit/wasm/gc-frame.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 --expose-gc
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 function makeFFI(func, t) {
   var builder = new WasmModuleBuilder();
 
-  var sig_index = builder.addSignature([10,t,t,t,t,t,t,t,t,t,t,1,t]);
+  var sig_index = builder.addType(makeSig([t,t,t,t,t,t,t,t,t,t], [t]));
   builder.addImport("func", sig_index);
   // Try to create a frame with lots of spilled values and parameters
   // on the stack to try to catch GC bugs in the reference maps for
   // the different parts of the stack.
   builder.addFunction("main", sig_index)
     .addBody([
       kExprGetLocal, 0,         // --
       kExprGetLocal, 1,         // --
       kExprGetLocal, 2,         // --
       kExprGetLocal, 3,         // --
@@ skipping 45 matching lines @@
 (function F64Test() {
   var main = makeFFI(print10, kAstF64);
   for (var i = 1; i < 2e+80; i *= -1137) {
     main(i - 1, i, i + 2, i + 3, i + 4, i + 5, i + 6, i + 7, i + 8);
   }
 })();
 
 (function GCInJSToWasmTest() {
   var builder = new WasmModuleBuilder();
 
-  var sig_index = builder.addSignature([1, kAstI32, 1, kAstI32]);
+  var sig_index = builder.addType(kSig_i_i);
   builder.addFunction("main", sig_index)
     .addBody([
       kExprGetLocal, 0,         // --
     ])                          // --
     .exportFunc();
 
   var main = builder.instantiate({}).exports.main;
 
   var gc_object = {
       valueOf: function() {
         // Call the GC in valueOf, which is called within the JSToWasm wrapper.
         gc();
         return {};
       }
   };
 
   main(gc_object);
 })();