Gemini WIP

Author: stevenfontanella

src/ir/effects.h

@@ -757,7 +757,7 @@ class EffectAnalyzer {
       }
     }
     void visitCallIndirect(CallIndirect* curr) {
-      auto* table = getModule()->getTable(curr->table);
+      auto* table = parent.module.getTable(curr->table);
       if (!Type::isSubType(Type(curr->heapType, Nullability::Nullable), table->type)) {
         parent.trap = true;
         return;

src/ir/type-updating.cpp

@@ -324,6 +324,25 @@ void GlobalTypeRewriter::mapTypes(const TypeMap& oldToNewTypes) {
   for (auto& tag : wasm.tags) {
     tag->type = updater.getNew(tag->type);
   }
+
+  // Update type effects.
+  std::unordered_map<HeapType, std::shared_ptr<const EffectAnalyzer>>
+    newTypeEffects;
+  for (auto& [oldType, effects] : wasm.typeEffects) {
+    if (!effects) {
+      continue;
+    }
+    auto newType = updater.getNew(oldType);
+    auto& targetEffects = newTypeEffects[newType];
+    if (!targetEffects) {
+      targetEffects = effects;
+    } else {
+      auto merged = std::make_shared<EffectAnalyzer>(*targetEffects);
+      merged->mergeIn(*effects);
+      targetEffects = merged;
+    }
+  }
+  wasm.typeEffects = std::move(newTypeEffects);
 }
 
 void GlobalTypeRewriter::mapTypeNamesAndIndices(const TypeMap& oldToNewTypes) {

test/lit/passes/global-effects-indirect-merge.wast

@@ -0,0 +1,44 @@
+;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.
+;; RUN: foreach %s %t wasm-opt --all-features --closed-world --generate-global-effects --minimize-rec-groups --vacuum --ignore-implicit-traps -S -o - | filecheck %s
+
+(module
+  (rec (type $A (func (result i32))))
+  (rec (type $B (func (result i32))))
+  (table 2 2 funcref)
+  (elem (i32.const 0) $pure_A)
+  (elem (i32.const 1) $pure_B)
+
+  ;; CHECK:      (func $pure_A (type $A) (result i32)
+  ;; CHECK-NEXT:  (unreachable)
+  ;; CHECK-NEXT: )
+  (func $pure_A (type $A)
+    (unreachable)
+  )
+  ;; CHECK:      (func $pure_B (type $A) (result i32)
+  ;; CHECK-NEXT:  (i32.const 0)
+  ;; CHECK-NEXT: )
+  (func $pure_B (type $B)
+    (i32.const 0)
+  )
+
+  ;; CHECK:      (func $test (type $1) (param $idx i32)
+  ;; CHECK-NEXT:  (drop
+  ;; CHECK-NEXT:   (call_indirect $0 (type $A)
+  ;; CHECK-NEXT:    (local.get $idx)
+  ;; CHECK-NEXT:   )
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT:  (drop
+  ;; CHECK-NEXT:   (call_indirect $0 (type $A)
+  ;; CHECK-NEXT:    (local.get $idx)
+  ;; CHECK-NEXT:   )
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $test (export "test") (param $idx i32)
+    (drop
+      (call_indirect (type $B) (local.get $idx))
+    )
+    (drop
+      (call_indirect (type $A) (local.get $idx))
+    )
+  )
+)