# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1367698545 -7200
# Node ID b4e7de9a13b1f8ba5615a5b5299dcdc8f5adb86b
# Parent  1e171a1586602674ff6a84467c5bfe0b52ba69df
use ControlSinkNode (instead of subclass) when establishing a forward graph order

diff -r 1e171a158660 -r b4e7de9a13b1 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java	Fri May 03 14:59:18 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java	Sat May 04 22:15:45 2013 +0200
@@ -22,9 +22,10 @@
  */
 package com.oracle.graal.nodes;
 
+import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.type.*;
 
-public abstract class ControlSinkNode extends FixedNode {
+public abstract class ControlSinkNode extends FixedNode implements Node.IterableNodeType {
 
     public ControlSinkNode(Stamp stamp) {
         super(stamp);
diff -r 1e171a158660 -r b4e7de9a13b1 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java	Fri May 03 14:59:18 2013 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java	Sat May 04 22:15:45 2013 +0200
@@ -39,13 +39,7 @@
 
         NodeBitMap visited = graph.createNodeBitMap();
 
-        for (ReturnNode node : graph.getNodes(ReturnNode.class)) {
-            result.visitForward(visited, node);
-        }
-        for (UnwindNode node : graph.getNodes(UnwindNode.class)) {
-            result.visitForward(visited, node);
-        }
-        for (DeoptimizeNode node : graph.getNodes(DeoptimizeNode.class)) {
+        for (ControlSinkNode node : graph.getNodes(ControlSinkNode.class)) {
             result.visitForward(visited, node);
         }
         return result;