Unify imported and non-imported things (#1678)

Fixes #1649

This moves us to a single object for functions, which can be imported or nor, and likewise for globals (as a result, GetGlobals do not need to check if the global is imported or not, etc.). All imported things now inherit from Importable, which has the module and base of the import, and if they are set then it is an import.

For convenient iteration, there are a few helpers like

ModuleUtils::iterDefinedGlobals(wasm, [&](Global* global) {
  .. use global ..
});

as often iteration only cares about imported or defined (non-imported) things.

Author: kripken

bin/wasm.js

@@ -190,7 +190,6 @@ export_function "_BinaryenLoopId"
 export_function "_BinaryenBreakId"
 export_function "_BinaryenSwitchId"
 export_function "_BinaryenCallId"
-export_function "_BinaryenCallImportId"
 export_function "_BinaryenCallIndirectId"
 export_function "_BinaryenGetLocalId"
 export_function "_BinaryenSetLocalId"
@@ -373,7 +372,6 @@ export_function "_BinaryenLoop"
 export_function "_BinaryenBreak"
 export_function "_BinaryenSwitch"
 export_function "_BinaryenCall"
-export_function "_BinaryenCallImport"
 export_function "_BinaryenCallIndirect"
 export_function "_BinaryenGetLocal"
 export_function "_BinaryenSetLocal"
@@ -434,11 +432,6 @@ export_function "_BinaryenCallGetTarget"
 export_function "_BinaryenCallGetNumOperands"
 export_function "_BinaryenCallGetOperand"
 
-# 'CallImport' expression operations
-export_function "_BinaryenCallImportGetTarget"
-export_function "_BinaryenCallImportGetNumOperands"
-export_function "_BinaryenCallImportGetOperand"
-
 # 'CallIndirect' expression operations
 export_function "_BinaryenCallIndirectGetTarget"
 export_function "_BinaryenCallIndirectGetNumOperands"
@@ -546,7 +539,6 @@ export_function "_BinaryenAddFunctionImport"
 export_function "_BinaryenAddTableImport"
 export_function "_BinaryenAddMemoryImport"
 export_function "_BinaryenAddGlobalImport"
-export_function "_BinaryenRemoveImport"
 export_function "_BinaryenAddFunctionExport"
 export_function "_BinaryenAddTableExport"
 export_function "_BinaryenAddMemoryExport"
@@ -594,12 +586,10 @@ export_function "_BinaryenFunctionRunPasses"
 export_function "_BinaryenFunctionSetDebugLocation"
 
 # 'Import' operations
-export_function "_BinaryenImportGetKind"
-export_function "_BinaryenImportGetModule"
-export_function "_BinaryenImportGetBase"
-export_function "_BinaryenImportGetName"
-export_function "_BinaryenImportGetGlobalType"
-export_function "_BinaryenImportGetFunctionType"
+export_function "_BinaryenGlobalImportGetModule"
+export_function "_BinaryenGlobalImportGetBase"
+export_function "_BinaryenFunctionImportGetModule"
+export_function "_BinaryenFunctionImportGetBase"
 
 # 'Export' operations
 export_function "_BinaryenExportGetKind"

build-js.sh

@@ -131,8 +131,8 @@
     )
   };
   BinaryenExpressionRef debugger;
-  if (1) debugger = BinaryenCallImport(module, "print", args, 1,
-                                       BinaryenNone());
+  if (1) debugger = BinaryenCall(module, "print", args, 1,
+                                 BinaryenNone());
   else debugger = BinaryenNop(module);
 
   // return the decision. need to subtract 4 that we just added,
@@ -177,7 +177,7 @@
       BinaryenConst(module, BinaryenLiteralInt32(%d))
     };
     BinaryenExpressionRef list[] = {
-      BinaryenCallImport(module, "print", args, 1, BinaryenNone()),
+      BinaryenCall(module, "print", args, 1, BinaryenNone()),
       BinaryenSetLocal(module, 0, BinaryenCall(module, "check", NULL, 0,
                                                BinaryenInt32()))
     };