From 759c485a9f35bd859d43b86b02e1397a669fa469 Mon Sep 17 00:00:00 2001
From: Thomas Lively <7121787+tlively@users.noreply.github.com>
Date: Wed, 11 Dec 2019 17:12:37 -0800
Subject: 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.
---
 src/tools/js-wrapper.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/tools/js-wrapper.h')

diff --git a/src/tools/js-wrapper.h b/src/tools/js-wrapper.h
index 34a823e97..a2d481f42 100644
--- a/src/tools/js-wrapper.h
+++ b/src/tools/js-wrapper.h
@@ -91,7 +91,7 @@ static std::string generateJSWrapper(Module& wasm) {
     ret += "try {\n";
     ret += std::string("  console.log('[fuzz-exec] calling $") + exp->name.str +
            "');\n";
-    if (func->result != none) {
+    if (func->sig.results != Type::none) {
       ret += std::string("  console.log('[fuzz-exec] note result: $") +
              exp->name.str + " => ' + literal(";
     } else {
@@ -99,7 +99,7 @@ static std::string generateJSWrapper(Module& wasm) {
     }
     ret += std::string("instance.exports.") + exp->name.str + "(";
     bool first = true;
-    for (Type param : func->params) {
+    for (Type param : func->sig.params.expand()) {
       // zeros in arguments TODO more?
       if (first) {
         first = false;
@@ -112,8 +112,8 @@ static std::string generateJSWrapper(Module& wasm) {
       }
     }
     ret += ")";
-    if (func->result != none) {
-      ret += ", '" + func->result.toString() + "'))";
+    if (func->sig.results != Type::none) {
+      ret += ", '" + func->sig.results.toString() + "'))";
       // TODO: getTempRet
     }
     ret += ";\n";
-- 
cgit v1.2.3