Mercurial > hg > graal-jvmci-8
changeset 3526:40121bcd2efc
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Tue, 09 Aug 2011 19:05:30 +0200 |
parents | e6998e327141 (diff) 65c865bba4c2 (current diff) |
children | 391302094f86 |
files | |
diffstat | 4 files changed, 4 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java Tue Aug 09 18:59:29 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Anchor.java Tue Aug 09 19:05:30 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<GuardNode> guards = new NodeInputList<GuardNode>(this); + @Input private final NodeInputList<GuardNode> guards = new NodeInputList<GuardNode>(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<GuardNode> happensAfterGuards() { - final Iterator<Node> usages = this.usages().iterator(); - return new Iterable<GuardNode>() { - public Iterator<GuardNode> iterator() { - return new Iterator<GuardNode>() { - 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(); - } - }; - } - }; - } }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java Tue Aug 09 18:59:29 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatingNode.java Tue Aug 09 19:05:30 2011 +0200 @@ -25,10 +25,8 @@ import com.oracle.max.graal.graph.*; import com.sun.cri.ci.*; -public abstract class FloatingNode extends Value { - +public abstract class FloatingNode extends Value implements Node.ValueNumberable { public FloatingNode(CiKind kind, Graph graph) { super(kind, graph); } - }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java Tue Aug 09 18:59:29 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Merge.java Tue Aug 09 19:05:30 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<EndNode> ends = new NodeInputList<EndNode>(this);
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java Tue Aug 09 18:59:29 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java Tue Aug 09 19:05:30 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;