Fix test

Author: stevenfontanella

src/support/graph_traversal.h

@@ -21,16 +21,20 @@
 
 namespace wasm {
 
-template<typename T, typename SuccessorFunction>
-  requires std::
-    invocable<SuccessorFunction, std::function<void(const T&)>&, const T&>
-  class Graph {
+// SuccessorFunction should be an invocable that takes a 'push' function (which
+// is an invocable that takes a `const T&`), and a `const T&`. i.e.
+// SuccessorFunction should call `push` for each neighbor of the T that it's
+// called with.
+// TODO: We don't have a good way to write this with concepts today.
+// Something like this should do it, but we hit an ICE on dwarf symbols in debug
+// builds: requires requires(const SuccessorFunction& successors, const T& t) {
+// successors([](const T&) { }, t); }
+template<typename T, typename SuccessorFunction> class Graph {
 public:
   template<std::input_iterator It, std::sentinel_for<It> Sen>
     requires std::convertible_to<std::iter_reference_t<It>, T>
-  Graph(It rootsBegin, Sen rootsEnd, auto&& successors)
-    : roots(rootsBegin, rootsEnd),
-      successors(std::forward<decltype(successors)>(successors)) {}
+  Graph(It rootsBegin, Sen rootsEnd, SuccessorFunction successors)
+    : roots(rootsBegin, rootsEnd), successors(std::move(successors)) {}
 
   // Traverse the graph depth-first, calling `successors` exactly once for each
   // node (unless the node appears multiple times in `roots`). Return the set of
@@ -40,12 +44,10 @@ template<typename T, typename SuccessorFunction>
     std::unordered_set<T> visited(roots.begin(), roots.end());
 
     auto maybePush = [&](const T& t) {
-      if (visited.contains(t)) {
-        return;
+      auto [_, inserted] = visited.insert(t);
+      if (inserted) {
+        stack.push_back(t);
       }
-
-      visited.insert(t);
-      stack.push_back(t);
     };
 
     while (!stack.empty()) {

test/lit/passes/global-effects-closed-world-simplify-locals.wast

@@ -1,16 +1,17 @@
 ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
-;; RUN: foreach %s %t wasm-opt -all --closed-world --generate-global-effects --simplify-locals -S -o - | filecheck %s
+;; RUN: foreach %s %t wasm-opt --enable-gc --enable-reference-types --closed-world --generate-global-effects --simplify-locals -S -o - | filecheck %s
 
 ;; Tests for aggregating effects from indirect calls in GlobalEffects when
 ;; --closed-world is true. Continued from global-effects-closed-world.wast.
 
 (module
-  ;; CHECK:      (type $indirect-type (sub (func (param i32))))
-  (type $indirect-type (sub (func (param i32))))
-  ;; CHECK:      (type $1 (func (param (ref $indirect-type))))
+  ;; CHECK:      (type $indirect-type-super (sub (func (param i32))))
+  (type $indirect-type-super (sub (func (param i32))))
 
-  ;; CHECK:      (type $indirect-type-sub (sub $indirect-type (func (param i32))))
-  (type $indirect-type-sub (sub $indirect-type (func (param i32))))
+  ;; CHECK:      (type $1 (func (param (ref $indirect-type-super))))
+
+  ;; CHECK:      (type $indirect-type-sub (sub $indirect-type-super (func (param i32))))
+  (type $indirect-type-sub (sub $indirect-type-super (func (param i32))))
 
   ;; CHECK:      (global $g1 (mut i32) (i32.const 0))
   (global $g1 (mut i32) (i32.const 0))
@@ -23,12 +24,12 @@
 
   ;; CHECK:      (export "impl2" (func $impl2))
 
-  ;; CHECK:      (func $impl1 (type $indirect-type) (param $i32 i32)
+  ;; CHECK:      (func $impl1 (type $indirect-type-super) (param $i32 i32)
   ;; CHECK-NEXT:  (global.set $g1
   ;; CHECK-NEXT:   (local.get $i32)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $impl1 (export "impl1") (type $indirect-type) (param $i32 i32)
+  (func $impl1 (export "impl1") (type $indirect-type-super) (param $i32 i32)
     (global.set $g1 (local.get $i32))
   )
 
@@ -41,18 +42,18 @@
     (global.set $g2 (local.get $i32))
   )
 
-  ;; CHECK:      (func $caller (type $1) (param $ref (ref $indirect-type))
-  ;; CHECK-NEXT:  (call_ref $indirect-type
+  ;; CHECK:      (func $caller (type $1) (param $ref (ref $indirect-type-super))
+  ;; CHECK-NEXT:  (call_ref $indirect-type-super
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:   (local.get $ref)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $caller (param $ref (ref $indirect-type))
+  (func $caller (param $ref (ref $indirect-type-super))
     ;; This inherits effects from $impl1 and $impl2, so may mutate $g1 and $g2.
-    (call_ref $indirect-type (i32.const 1) (local.get $ref))
+    (call_ref $indirect-type-super (i32.const 1) (local.get $ref))
   )
 
-  ;; CHECK:      (func $merges-multiple-effects (type $1) (param $ref (ref $indirect-type))
+  ;; CHECK:      (func $test-merge (type $1) (param $ref (ref $indirect-type-super))
   ;; CHECK-NEXT:  (local $x i32)
   ;; CHECK-NEXT:  (local $y i32)
   ;; CHECK-NEXT:  (local $z i32)
@@ -62,9 +63,7 @@
   ;; CHECK-NEXT:  (local.set $y
   ;; CHECK-NEXT:   (global.get $g2)
   ;; CHECK-NEXT:  )
-  ;; CHECK-NEXT:  (local.set $z
-  ;; CHECK-NEXT:   (global.get $g3)
-  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT:  (call $caller
   ;; CHECK-NEXT:   (local.get $ref)
   ;; CHECK-NEXT:  )
@@ -75,10 +74,10 @@
   ;; CHECK-NEXT:   (local.get $y)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT:  (drop
-  ;; CHECK-NEXT:   (local.get $z)
+  ;; CHECK-NEXT:   (global.get $g3)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $merges-multiple-effects (param $ref (ref $indirect-type))
+  (func $merges-multiple-effects (param $ref (ref $indirect-type-super))
     (local $x i32)
     (local $y i32)
     (local $z i32)