Mercurial > hg > truffle

changeset 15848:11328036d854

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in ConditionalEliminationPhase that loses the connection from guard to checkcast PiNode
author Lukas Stadler <lukas.stadler@oracle.com>
date Thu, 22 May 2014 14:04:55 +0200
parents 9e172511971d
children e7277bf3b171
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Thu May 22 14:04:55 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Thu May 22 14:04:55 2014 +0200
@@ -710,7 +710,9 @@
                     if (nonNull) {
                         replacementAnchor = searchAnchor(GraphUtil.unproxify(object), type);
                     }
-                    replacementAnchor = BeginNode.prevBegin(checkCast);
+                    if (replacementAnchor == null) {
+                        replacementAnchor = BeginNode.prevBegin(checkCast);
+                    }
                     PiNode piNode;
                     if (isNull) {
                         ConstantNode nullObject = ConstantNode.defaultForKind(Kind.Object, graph);