Remove FunctionType (#2510)

Function signatures were previously redundantly stored on Function
objects as well as on FunctionType objects. These two signature
representations had to always be kept in sync, which was error-prone
and needlessly complex. This PR takes advantage of the new ability of
Type to represent multiple value types by consolidating function
signatures as a pair of Types (params and results) stored on the
Function object.

Since there are no longer module-global named function types,
significant changes had to be made to the printing and emitting of
function types, as well as their parsing and manipulation in various
passes.

The C and JS APIs and their tests also had to be updated to remove
named function types.

1 files changed, 5 insertions, 11 deletions

diff --git a/src/passes/TrapMode.cpp b/src/passes/TrapMode.cpp
index c00c34eca..9c855d8c1 100644
--- a/src/passes/TrapMode.cpp
+++ b/src/passes/TrapMode.cpp
@@ -22,7 +22,6 @@
 
 #include "asm_v_wasm.h"
 #include "asmjs/shared-constants.h"
-#include "ir/function-type-utils.h"
 #include "ir/trapping.h"
 #include "mixed_arena.h"
 #include "pass.h"
@@ -125,9 +124,7 @@ Function* generateBinaryFunc(Module& wasm, Binary* curr) {
   }
   auto func = new Function;
   func->name = getBinaryFuncName(curr);
-  func->params.push_back(type);
-  func->params.push_back(type);
-  func->result = type;
+  func->sig = Signature({type, type}, type);
   func->body =
     builder.makeIf(builder.makeUnary(eqZOp, builder.makeLocalGet(1, type)),
                    builder.makeConst(zeroLit),
@@ -188,8 +185,7 @@ Function* generateUnaryFunc(Module& wasm, Unary* curr) {
 
   auto func = new Function;
   func->name = getUnaryFuncName(curr);
-  func->params.push_back(type);
-  func->result = retType;
+  func->sig = Signature(type, retType);
   func->body = builder.makeUnary(truncOp, builder.makeLocalGet(0, type));
   // too small XXX this is different than asm.js, which does frem. here we
   // clamp, which is much simpler/faster, and similar to native builds
@@ -240,14 +236,12 @@ void ensureF64ToI64JSImport(TrappingFunctionContainer& trappingFunctions) {
     return;
   }
 
-  Module& wasm = trappingFunctions.getModule();
-  auto import = new Function; // f64-to-int = asm2wasm.f64-to-int;
+  // f64-to-int = asm2wasm.f64-to-int;
+  auto import = new Function;
   import->name = F64_TO_INT;
   import->module = ASM2WASM;
   import->base = F64_TO_INT;
-  auto* functionType = ensureFunctionType("id", &wasm);
-  import->type = functionType->name;
-  FunctionTypeUtils::fillFunction(import, functionType);
+  import->sig = Signature(Type::f64, Type::i32);
   trappingFunctions.addImport(import);
 }