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.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/ir/global-utils.h b/src/ir/global-utils.h
index bcf0dae72..02bbbf2d2 100644
--- a/src/ir/global-utils.h
+++ b/src/ir/global-utils.h
@@ -22,6 +22,7 @@
 
 #include "literal.h"
 #include "wasm.h"
+#include "ir/module-utils.h"
 
 namespace wasm {
 
@@ -30,22 +31,22 @@ namespace GlobalUtils {
   inline Global* getGlobalInitializedToImport(Module& wasm, Name module, Name base) {
     // find the import
     Name imported;
-    for (auto& import : wasm.imports) {
+    ModuleUtils::iterImportedGlobals(wasm, [&](Global* import) {
       if (import->module == module && import->base == base) {
         imported = import->name;
-        break;
       }
-    }
+    });
     if (imported.isNull()) return nullptr;
     // find a global inited to it
-    for (auto& global : wasm.globals) {
-      if (auto* init = global->init->dynCast<GetGlobal>()) {
+    Global* ret = nullptr;
+    ModuleUtils::iterDefinedGlobals(wasm, [&](Global* defined) {
+      if (auto* init = defined->init->dynCast<GetGlobal>()) {
         if (init->name == imported) {
-          return global.get();
+          ret = defined;
         }
       }
-    }
-    return nullptr;
+    });
+    return ret;
   }
 };