# HG changeset patch # User Thomas Wuerthinger # Date 1308234177 -7200 # Node ID 7b1cdb0e21d9f98e8b74aa8a1d24c5fcd75a5636 # Parent a7a7e87ad23026f32697707f2564742c88cd16db BlockEnd no longer extends Instruction. diff -r a7a7e87ad230 -r 7b1cdb0e21d9 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/BlockEnd.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/BlockEnd.java Thu Jun 16 16:19:36 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/BlockEnd.java Thu Jun 16 16:22:57 2011 +0200 @@ -31,7 +31,7 @@ * The {@code BlockEnd} instruction is a base class for all instructions that end a basic * block, including branches, switches, throws, and goto's. */ -public abstract class BlockEnd extends Instruction { +public abstract class BlockEnd extends FixedNode { private static final int INPUT_COUNT = 0; @@ -118,11 +118,4 @@ List list = (List) successors().subList(super.successorCount() + SUCCESSOR_COUNT, super.successorCount() + blockSuccessorCount + SUCCESSOR_COUNT); return Collections.unmodifiableList(list); } - - public void clearSuccessors() { - for (int i = 0; i < blockSuccessorCount(); i++) { - setBlockSuccessor(i, null); - } - } - } diff -r a7a7e87ad230 -r 7b1cdb0e21d9 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Return.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Return.java Thu Jun 16 16:19:36 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Return.java Thu Jun 16 16:22:57 2011 +0200 @@ -58,11 +58,6 @@ return (Value) inputs().set(super.inputCount() + INPUT_RESULT, n); } - @Override - public Instruction next() { - return null; - } - /** * Constructs a new Return instruction. * @param result the instruction producing the result for this return; {@code null} if this diff -r a7a7e87ad230 -r 7b1cdb0e21d9 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Unwind.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Unwind.java Thu Jun 16 16:19:36 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Unwind.java Thu Jun 16 16:22:57 2011 +0200 @@ -46,11 +46,6 @@ return super.successorCount() + SUCCESSOR_COUNT; } - @Override - public Instruction next() { - return null; - } - /** * The instruction that produces the exception object. */