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/ir/function-utils.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/ir/function-utils.h')

diff --git a/src/ir/function-utils.h b/src/ir/function-utils.h
index 61af153a0..f172240e2 100644
--- a/src/ir/function-utils.h
+++ b/src/ir/function-utils.h
@@ -28,23 +28,17 @@ namespace FunctionUtils {
 // everything but their name (which can't be the same, in the same
 // module!) - same params, vars, body, result, etc.
 inline bool equal(Function* left, Function* right) {
-  if (left->getNumParams() != right->getNumParams()) {
+  if (left->sig != right->sig) {
     return false;
   }
   if (left->getNumVars() != right->getNumVars()) {
     return false;
   }
-  for (Index i = 0; i < left->getNumLocals(); i++) {
+  for (Index i = left->sig.params.size(); i < left->getNumLocals(); i++) {
     if (left->getLocalType(i) != right->getLocalType(i)) {
       return false;
     }
   }
-  if (left->result != right->result) {
-    return false;
-  }
-  if (left->type != right->type) {
-    return false;
-  }
   if (!left->imported() && !right->imported()) {
     return ExpressionAnalyzer::equal(left->body, right->body);
   }
-- 
cgit v1.2.3