Mercurial > hg > graal-compiler

diff graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java @ 15374:669536c4949a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up ExceptionObjectNode lowering
author Lukas Stadler <lukas.stadler@oracle.com>
date Fri, 25 Apr 2014 10:13:54 +0200
parents 644dfe49c0f4
children 63aad7e1c867
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java	Thu Apr 24 23:32:30 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java	Fri Apr 25 10:13:54 2014 +0200
@@ -25,8 +25,8 @@
 import java.util.*;
 
 import com.oracle.graal.compiler.common.cfg.*;
+import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.java.*;
 
 public final class Block extends AbstractBlockBase<Block> {
 
@@ -67,7 +67,8 @@
     }
 
     public boolean isExceptionEntry() {
-        return getBeginNode() instanceof ExceptionObjectNode;
+        Node predecessor = getBeginNode().predecessor();
+        return predecessor != null && predecessor instanceof InvokeWithExceptionNode && getBeginNode() != ((InvokeWithExceptionNode) predecessor).exceptionEdge();
     }
 
     public Block getFirstPredecessor() {