Mercurial > hg > graal-compiler
changeset 9559:b4e7de9a13b1
use ControlSinkNode (instead of subclass) when establishing a forward graph order
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Sat, 04 May 2013 22:15:45 +0200 |
parents | 1e171a158660 |
children | 08d1414ac62d |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSinkNode.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java |
diffstat | 2 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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;