# HG changeset patch
# User Bernhard Urban <bernhard.urban@jku.at>
# Date 1387292943 -3600
# Node ID 79298b99df02544374bedefbf79453d79833fbd2
# Parent  413040ab993ee49993b67db5e29eae101dfbadb5
IncrementalCanonicalizer: use HashSetNodeChangeListener

diff -r 413040ab993e -r 79298b99df02 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java	Tue Dec 17 16:00:57 2013 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java	Tue Dec 17 16:09:03 2013 +0100
@@ -22,13 +22,10 @@
  */
 package com.oracle.graal.phases.common;
 
-import java.util.*;
-
 import com.oracle.graal.graph.Graph.Mark;
-import com.oracle.graal.graph.Graph.NodeChangedListener;
-import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.phases.*;
+import com.oracle.graal.phases.common.util.*;
 import com.oracle.graal.phases.tiers.*;
 
 /**
@@ -46,15 +43,8 @@
     @Override
     protected void run(StructuredGraph graph, C context) {
         Mark newNodesMark = graph.getMark();
-        final Set<Node> changedNodes = new HashSet<>();
 
-        NodeChangedListener listener = new NodeChangedListener() {
-
-            @Override
-            public void nodeChanged(Node node) {
-                changedNodes.add(node);
-            }
-        };
+        HashSetNodeChangeListener listener = new HashSetNodeChangeListener();
         graph.trackInputChange(listener);
         graph.trackUsagesDroppedZero(listener);
 
@@ -63,8 +53,8 @@
         graph.stopTrackingInputChange();
         graph.stopTrackingUsagesDroppedZero();
 
-        if (graph.getMark() != newNodesMark || !changedNodes.isEmpty()) {
-            canonicalizer.applyIncremental(graph, context, changedNodes, newNodesMark, false);
+        if (graph.getMark() != newNodesMark || !listener.getChangedNodes().isEmpty()) {
+            canonicalizer.applyIncremental(graph, context, listener.getChangedNodes(), newNodesMark, false);
         }
     }
 }