Mercurial > hg > graal-compiler
changeset 9435:794370a64b71
Replace AbstractEndNode usages with EndNode usages wherever appropriate.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 29 Apr 2013 00:06:45 +0200 |
parents | 50f02c7d1cec |
children | ae815a4c112a |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/PostOrderNodeIterator.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ReentrantNodeIterator.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ScopedPostOrderNodeIterator.java |
diffstat | 4 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Sun Apr 28 23:59:14 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Mon Apr 29 00:06:45 2013 +0200 @@ -491,8 +491,8 @@ queueSuccessors(current); } else if (current instanceof FixedWithNextNode) { queueSuccessors(current); - } else if (current instanceof AbstractEndNode) { - queueMerge((AbstractEndNode) current); + } else if (current instanceof EndNode) { + queueMerge((EndNode) current); } else if (current instanceof ControlSinkNode) { // nothing todo } else if (current instanceof ControlSplitNode) {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/PostOrderNodeIterator.java Sun Apr 28 23:59:14 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/PostOrderNodeIterator.java Mon Apr 29 00:06:45 2013 +0200 @@ -85,9 +85,9 @@ assert next != null : current; node(current); current = next; - } else if (current instanceof AbstractEndNode) { - end((AbstractEndNode) current); - queueMerge((AbstractEndNode) current); + } else if (current instanceof EndNode) { + end((EndNode) current); + queueMerge((EndNode) current); current = nextQueuedNode(); } else if (current instanceof ControlSinkNode) { node(current); @@ -175,7 +175,7 @@ } } - private void queueMerge(AbstractEndNode end) { + private void queueMerge(EndNode end) { assert !visitedEnds.isMarked(end); assert !nodeStates.containsKey(end); nodeStates.put(end, state); @@ -195,7 +195,7 @@ protected abstract void node(FixedNode node); - protected void end(AbstractEndNode endNode) { + protected void end(EndNode endNode) { node(endNode); }
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ReentrantNodeIterator.java Sun Apr 28 23:59:14 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ReentrantNodeIterator.java Mon Apr 29 00:06:45 2013 +0200 @@ -94,9 +94,9 @@ if (!successors.hasNext()) { if (current instanceof LoopEndNode) { blockEndStates.put(current, state); - } else if (current instanceof AbstractEndNode) { + } else if (current instanceof EndNode) { // add the end node and see if the merge is ready for processing - MergeNode merge = ((AbstractEndNode) current).merge(); + MergeNode merge = ((EndNode) current).merge(); if (merge instanceof LoopBeginNode) { Map<LoopExitNode, StateT> loopExitState = closure.processLoop((LoopBeginNode) merge, state); for (Map.Entry<LoopExitNode, StateT> entry : loopExitState.entrySet()) {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ScopedPostOrderNodeIterator.java Sun Apr 28 23:59:14 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/ScopedPostOrderNodeIterator.java Mon Apr 29 00:06:45 2013 +0200 @@ -71,8 +71,8 @@ queueSuccessors(current); } else if (current instanceof FixedWithNextNode) { queueSuccessors(current); - } else if (current instanceof AbstractEndNode) { - queueMerge((AbstractEndNode) current); + } else if (current instanceof EndNode) { + queueMerge((EndNode) current); } else if (current instanceof ControlSinkNode) { // nothing todo } else if (current instanceof ControlSplitNode) {