# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1308234689 -7200
# Node ID ba35c5e9894eed713f013c522c21de8906ae05da
# Parent  7b1cdb0e21d9f98e8b74aa8a1d24c5fcd75a5636
Return and Unwind are no longer a BlockEnd.

diff -r 7b1cdb0e21d9 -r ba35c5e9894e 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:22:57 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/BlockEnd.java	Thu Jun 16 16:31:29 2011 +0200
@@ -70,7 +70,7 @@
      * @param kind the type of the value produced by this instruction
      * @param successors the list of successor blocks. If {@code null}, a new one will be created.
      */
-    public BlockEnd(CiKind kind, List<? extends Instruction> blockSuccessors, int inputCount, int successorCount, Graph graph) {
+    public BlockEnd(CiKind kind, List<? extends FixedNode> blockSuccessors, int inputCount, int successorCount, Graph graph) {
         this(kind, blockSuccessors.size(), inputCount, successorCount, graph);
         for (int i = 0; i < blockSuccessors.size(); i++) {
             setBlockSuccessor(i, blockSuccessors.get(i));
diff -r 7b1cdb0e21d9 -r ba35c5e9894e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LookupSwitch.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LookupSwitch.java	Thu Jun 16 16:22:57 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LookupSwitch.java	Thu Jun 16 16:31:29 2011 +0200
@@ -48,7 +48,7 @@
      * @param stateAfter the state after the switch
      * @param graph
      */
-    public LookupSwitch(Value value, List<? extends Instruction> successors, int[] keys, Graph graph) {
+    public LookupSwitch(Value value, List<? extends FixedNode> successors, int[] keys, Graph graph) {
         super(value, successors, INPUT_COUNT, SUCCESSOR_COUNT, graph);
         this.keys = keys;
     }
diff -r 7b1cdb0e21d9 -r ba35c5e9894e 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:22:57 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Return.java	Thu Jun 16 16:31:29 2011 +0200
@@ -29,7 +29,7 @@
 /**
  * The {@code Return} class definition.
  */
-public final class Return extends BlockEnd {
+public final class Return extends FixedNode {
 
     private static final int INPUT_COUNT = 1;
     private static final int INPUT_RESULT = 0;
@@ -65,13 +65,13 @@
      * @param graph
      */
     public Return(Value result, Graph graph) {
-        super(result == null ? CiKind.Void : result.kind, 0, INPUT_COUNT, SUCCESSOR_COUNT, graph);
+        super(result == null ? CiKind.Void : result.kind, INPUT_COUNT, SUCCESSOR_COUNT, graph);
         setResult(result);
     }
 
     // for copying
     private Return(CiKind kind, Graph graph) {
-        super(kind, 0, INPUT_COUNT, SUCCESSOR_COUNT, graph);
+        super(kind, INPUT_COUNT, SUCCESSOR_COUNT, graph);
     }
 
     @Override
diff -r 7b1cdb0e21d9 -r ba35c5e9894e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Switch.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Switch.java	Thu Jun 16 16:22:57 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Switch.java	Thu Jun 16 16:31:29 2011 +0200
@@ -65,7 +65,7 @@
      * @param stateAfter the state after the switch
      * @param graph
      */
-    public Switch(Value value, List<? extends Instruction> successors, int inputCount, int successorCount, Graph graph) {
+    public Switch(Value value, List<? extends FixedNode> successors, int inputCount, int successorCount, Graph graph) {
         super(CiKind.Illegal, successors, inputCount + INPUT_COUNT, successorCount + SUCCESSOR_COUNT, graph);
         setValue(value);
     }
diff -r 7b1cdb0e21d9 -r ba35c5e9894e graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/TableSwitch.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/TableSwitch.java	Thu Jun 16 16:22:57 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/TableSwitch.java	Thu Jun 16 16:31:29 2011 +0200
@@ -47,7 +47,7 @@
      * @param stateAfter the state after the switch
      * @param graph
      */
-    public TableSwitch(Value value, List<? extends Instruction> successors, int lowKey, Graph graph) {
+    public TableSwitch(Value value, List<? extends FixedNode> successors, int lowKey, Graph graph) {
         super(value, successors, INPUT_COUNT, SUCCESSOR_COUNT, graph);
         this.lowKey = lowKey;
     }
diff -r 7b1cdb0e21d9 -r ba35c5e9894e 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:22:57 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Unwind.java	Thu Jun 16 16:31:29 2011 +0200
@@ -29,7 +29,7 @@
 /**
  * Unwind takes an exception object, destroys the current stack frame and passes the exception object to the system's exception dispatch code.
  */
-public final class Unwind extends BlockEnd {
+public final class Unwind extends FixedNode {
 
     private static final int INPUT_COUNT = 1;
     private static final int INPUT_EXCEPTION = 0;
@@ -59,7 +59,7 @@
     }
 
     public Unwind(Value exception, Graph graph) {
-        super(CiKind.Object, 0, INPUT_COUNT, SUCCESSOR_COUNT, graph);
+        super(CiKind.Object, INPUT_COUNT, SUCCESSOR_COUNT, graph);
         setException(exception);
     }