# HG changeset patch # User Thomas Wuerthinger # Date 1312905166 -7200 # Node ID 9c9f2cd9e922f27204f1c0a66b27c464dea60213 # Parent 159e702d578c72eaf6c8c1cdfc385ab5d99b8960 small clean ups diff -r 159e702d578c -r 9c9f2cd9e922 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java Tue Aug 09 16:33:53 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java Tue Aug 09 17:52:46 2011 +0200 @@ -22,8 +22,6 @@ */ package com.oracle.max.graal.compiler.ir; -import java.util.*; - import com.oracle.max.graal.compiler.debug.*; import com.oracle.max.graal.graph.*; import com.sun.cri.ci.*; @@ -33,12 +31,8 @@ */ public final class Anchor extends FixedNodeWithNext { - @Input private final NodeInputList guards = new NodeInputList(this); + @Input private final NodeInputList guards = new NodeInputList(this); - /** - * Constructs a new Anchor instruction. - * @param graph - */ public Anchor(Graph graph) { super(CiKind.Illegal, graph); } @@ -56,40 +50,4 @@ public void print(LogStream out) { out.print("anchor ").print(next()); } - - public Iterable happensAfterGuards() { - final Iterator usages = this.usages().iterator(); - return new Iterable() { - public Iterator iterator() { - return new Iterator() { - private GuardNode next; - @Override - public boolean hasNext() { - if (next == null) { - while (usages.hasNext()) { - Node cur = usages.next(); - if (cur instanceof GuardNode) { - next = ((GuardNode) cur); - break; - } - } - } - return next != null; - } - - @Override - public GuardNode next() { - GuardNode result = next; - next = null; - return result; - } - - @Override - public void remove() { - throw new IllegalStateException(); - } - }; - } - }; - } } diff -r 159e702d578c -r 9c9f2cd9e922 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java Tue Aug 09 16:33:53 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java Tue Aug 09 17:52:46 2011 +0200 @@ -25,7 +25,7 @@ import com.oracle.max.graal.graph.*; import com.sun.cri.ci.*; -public abstract class FloatingNode extends Value implements Node.ValueNumberable { +public abstract class FloatingNode extends Value implements Node.ValueNumberable { public FloatingNode(CiKind kind, Graph graph) { super(kind, graph); } diff -r 159e702d578c -r 9c9f2cd9e922 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java Tue Aug 09 16:33:53 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java Tue Aug 09 17:52:46 2011 +0200 @@ -35,7 +35,7 @@ * about the basic block, including the successor and * predecessor blocks, exception handlers, liveness information, etc. */ -public class Merge extends StateSplit{ +public class Merge extends StateSplit { @Input private final NodeInputList ends = new NodeInputList(this); diff -r 159e702d578c -r 9c9f2cd9e922 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java Tue Aug 09 16:33:53 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java Tue Aug 09 17:52:46 2011 +0200 @@ -34,7 +34,7 @@ */ public abstract class StateSplit extends FixedNodeWithNext { - @Input private FrameState stateAfter; + @Input private FrameState stateAfter; public FrameState stateAfter() { return stateAfter;