Try allowing globals to be imported in ctor eval

Author: stevenfontanella

src/tools/wasm-ctor-eval.cpp

@@ -71,23 +71,16 @@ class EvallingModuleRunner;
 
 class EvallingImportResolver : public ImportResolver {
 public:
-  EvallingImportResolver(
-    std::map<Name, std::shared_ptr<EvallingModuleRunner>> linkedInstances,
-    ModuleRunnerBase<EvallingModuleRunner>::ExternalInterface*
-      externalInterface)
-    : externalInterface(externalInterface) {}
+  EvallingImportResolver() {}
 
   std::optional<Literals*> getGlobal(QualifiedName name,
                                      Type type) const override {
-    externalInterface->trap((std::stringstream()
-                             << "EvallingImportResolver: unexpected getGlobal "
-                             << name)
-                              .str());
-    return std::nullopt;
+    auto [it, _] = stubLiterals.try_emplace(name, Literals({Literal(type)}));
+    return &it->second;
   }
 
 private:
-  ModuleRunnerBase<EvallingModuleRunner>::ExternalInterface* externalInterface;
+  mutable std::map<QualifiedName, Literals> stubLiterals;
 };
 
 class EvallingModuleRunner : public ModuleRunnerBase<EvallingModuleRunner> {
@@ -98,8 +91,7 @@ class EvallingModuleRunner : public ModuleRunnerBase<EvallingModuleRunner> {
     std::map<Name, std::shared_ptr<EvallingModuleRunner>> linkedInstances_ = {})
     : ModuleRunnerBase(wasm,
                        externalInterface,
-                       std::make_shared<EvallingImportResolver>(
-                         linkedInstances_, externalInterface),
+                       std::make_shared<EvallingImportResolver>(),
                        linkedInstances_) {}
 
   Flow visitGlobalGet(GlobalGet* curr) {
@@ -570,6 +562,9 @@ struct CtorEvalExternalInterface : EvallingModuleRunner::ExternalInterface {
     wasm->updateMaps();
 
     for (auto& oldGlobal : oldGlobals) {
+      if (oldGlobal->imported()) {
+        continue;
+      }
       // Serialize the global's value. While doing so, pass in the name of this
       // global, as we may be able to reuse the global as the defining global
       // for the value. See getSerialization() for more details.

src/wasm/qualified-name.h

@@ -13,6 +13,10 @@ struct QualifiedName {
   friend std::ostream& operator<<(std::ostream& o, const QualifiedName& qname) {
     return o << qname.module << "." << qname.name;
   }
+
+  bool operator<(const QualifiedName& other) const {
+    return std::tie(module, name) < std::tie(other.module, other.name);
+  }
 };
 
 } // namespace wasm

test/ctor-eval/global-get-init.wast.out

@@ -1,7 +1,2 @@
 (module
- (type $0 (func))
- (export "test1" (func $test1))
- (func $test1 (type $0)
-  (nop)
- )
 )