Mercurial > hg > graal-compiler

changeset 13368:79298b99df02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
IncrementalCanonicalizer: use HashSetNodeChangeListener
author Bernhard Urban <bernhard.urban@jku.at>
date Tue, 17 Dec 2013 16:09:03 +0100
parents 413040ab993e
children c3ecad078114
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IncrementalCanonicalizerPhase.java
diffstat 1 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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);
         }
     }
 }