src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java

rev 52509 : [mq]: graal

*** 67,77 ****
  import org.graalvm.compiler.nodes.memory.MemoryNode;
  import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
  import org.graalvm.compiler.nodes.memory.ReadNode;
  import org.graalvm.compiler.nodes.util.GraphUtil;
  import org.graalvm.compiler.phases.Phase;
! import org.graalvm.compiler.phases.common.util.HashSetNodeEventListener;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
  import jdk.internal.vm.compiler.word.LocationIdentity;
  
--- 67,77 ----
  import org.graalvm.compiler.nodes.memory.MemoryNode;
  import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
  import org.graalvm.compiler.nodes.memory.ReadNode;
  import org.graalvm.compiler.nodes.util.GraphUtil;
  import org.graalvm.compiler.phases.Phase;
! import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
  import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
  import jdk.internal.vm.compiler.word.LocationIdentity;
  
*** 219,229 ****
                  HIRLoop loop = (HIRLoop) l;
                  processLoop(loop, modifiedInLoops);
              }
          }
  
!         HashSetNodeEventListener listener = new HashSetNodeEventListener(EnumSet.of(NODE_ADDED, ZERO_USAGES));
          try (NodeEventScope nes = graph.trackNodeEvents(listener)) {
              ReentrantNodeIterator.apply(new FloatingReadClosure(modifiedInLoops, createFloatingReads, createMemoryMapNodes), graph.start(), new MemoryMapImpl(graph.start()));
          }
  
          for (Node n : removeExternallyUsedNodes(listener.getNodes())) {
--- 219,229 ----
                  HIRLoop loop = (HIRLoop) l;
                  processLoop(loop, modifiedInLoops);
              }
          }
  
!         EconomicSetNodeEventListener listener = new EconomicSetNodeEventListener(EnumSet.of(NODE_ADDED, ZERO_USAGES));
          try (NodeEventScope nes = graph.trackNodeEvents(listener)) {
              ReentrantNodeIterator.apply(new FloatingReadClosure(modifiedInLoops, createFloatingReads, createMemoryMapNodes), graph.start(), new MemoryMapImpl(graph.start()));
          }
  
          for (Node n : removeExternallyUsedNodes(listener.getNodes())) {