# HG changeset patch # User Bernhard Urban # Date 1370871681 -7200 # Node ID 6c13b749d3f9ee13d32a255097390e6a0721f779 # Parent e2ffbaa682b84d2eba5ceafa6374317931fc3ca5 Tool: make class non-static diff -r e2ffbaa682b8 -r 6c13b749d3f9 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Mon Jun 10 12:22:42 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Mon Jun 10 15:41:21 2013 +0200 @@ -119,7 +119,7 @@ if (newNodesMark > 0) { workList.addAll(graph.getNewNodes(newNodesMark)); } - tool = new Tool(workList, runtime, assumptions, canonicalizeReads); + tool = new Tool(); processWorkSet(graph); } @@ -309,19 +309,7 @@ } } - private static final class Tool implements SimplifierTool { - - private final NodeWorkList nodeWorkSet; - private final MetaAccessProvider runtime; - private final Assumptions assumptions; - private final boolean canonicalizeReads; - - public Tool(NodeWorkList nodeWorkSet, MetaAccessProvider runtime, Assumptions assumptions, boolean canonicalizeReads) { - this.nodeWorkSet = nodeWorkSet; - this.runtime = runtime; - this.assumptions = assumptions; - this.canonicalizeReads = canonicalizeReads; - } + private final class Tool implements SimplifierTool { @Override public void deleteBranch(FixedNode branch) { @@ -345,7 +333,7 @@ @Override public void addToWorkList(Node node) { - nodeWorkSet.addAgain(node); + workList.addAgain(node); } @Override