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, 20 insertions, 17 deletions

diff --git a/test/example/relooper-merge4.c b/test/example/relooper-merge4.c
index 86ba272f2..b168a2db6 100644
--- a/test/example/relooper-merge4.c
+++ b/test/example/relooper-merge4.c
@@ -1,5 +1,3 @@
-
-
 #include <assert.h>
 #include <stdio.h>
 
@@ -67,10 +65,13 @@ int main() {
     NULL, checkBodyList, sizeof(checkBodyList) / sizeof(BinaryenExpressionRef),
     BinaryenTypeInt32()
   );
-  BinaryenFunctionTypeRef i = BinaryenAddFunctionType(module, "i",
-                                                      BinaryenTypeInt32(),
-                                                      NULL, 0);
-  BinaryenAddFunction(module, "check", i, NULL, 0, checkBody);
+  BinaryenAddFunction(module,
+                      "check",
+                      BinaryenTypeNone(),
+                      BinaryenTypeInt32(),
+                      NULL,
+                      0,
+                      checkBody);
 
   // contents of main() begin here
 
@@ -175,22 +176,24 @@ int main() {
 
   BinaryenExpressionRef body = RelooperRenderAndDispose(relooper, b0, 1);
 
-  BinaryenFunctionTypeRef v = BinaryenAddFunctionType(module, "v",
-                                                      BinaryenTypeNone(),
-                                                      NULL, 0);
   // locals: state, free-for-label
   BinaryenType localTypes[] = { BinaryenTypeInt32(), BinaryenTypeInt32() };
-  BinaryenFunctionRef theMain = BinaryenAddFunction(module, "main", v,
-                                                    localTypes, 2, body);
+  BinaryenFunctionRef theMain = BinaryenAddFunction(module,
+                                                    "main",
+                                                    BinaryenTypeNone(),
+                                                    BinaryenTypeNone(),
+                                                    localTypes,
+                                                    2,
+                                                    body);
   BinaryenSetStart(module, theMain);
 
   // import
-
-  BinaryenType iparams[] = { BinaryenTypeInt32() };
-  BinaryenFunctionTypeRef vi = BinaryenAddFunctionType(module, "vi",
-                                                       BinaryenTypeNone(),
-                                                       iparams, 1);
-  BinaryenAddFunctionImport(module, "print", "spectest", "print", vi);
+  BinaryenAddFunctionImport(module,
+                            "print",
+                            "spectest",
+                            "print",
+                            BinaryenTypeInt32(),
+                            BinaryenTypeNone());
 
   // memory
   BinaryenSetMemory(module, 1, 1, "mem", NULL, NULL, NULL, NULL, 0, 0);