Mercurial > hg > truffle

diff graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2822:530366123e46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Invoke is a block end
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Fri, 27 May 2011 15:41:10 +0200
parents d6bf240963fb
children ac4b086cbd72
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Fri May 27 14:20:30 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Fri May 27 15:41:10 2011 +0200
@@ -29,6 +29,7 @@
 import java.util.*;
 
 import com.oracle.graal.graph.*;
+import com.oracle.max.graal.schedule.Schedule;
 import com.sun.c1x.*;
 import com.sun.c1x.debug.*;
 import com.sun.c1x.graph.BlockMap.*;
@@ -421,7 +422,7 @@
             FrameState stateWithException = entryState.duplicateModified(bci, CiKind.Void, exception);
 
             Instruction successor = createTarget(dispatchBlock, stateWithException);
-            BlockEnd end = new Anchor(successor, graph);
+            Anchor end = new Anchor(successor, graph);
             exception.appendNext(end);
 
             if (x instanceof Invoke) {
@@ -1204,7 +1205,7 @@
             traceInstruction(bci, opcode, blockStart);
             processBytecode(bci, opcode);
 
-            if (lastInstr instanceof BlockEnd || lastInstr.next() != null) {
+            if (Schedule.isBlockEnd(lastInstr) || lastInstr.next() != null) {
                 break;
             }