Mercurial > hg > graal-compiler

changeset 21586:6da76343d830

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 29 May 2015 12:09:07 +0200
parents 453284d62d64 (diff) 9bb04af58490 (current diff)
children 772d5126b796
files env
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java	Fri May 29 11:35:20 2015 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java	Fri May 29 12:09:07 2015 +0200
@@ -243,8 +243,12 @@
                 survivingSuccessor.replaceAtPredecessor(null);
                 node.replaceAtPredecessor(survivingSuccessor);
                 GraphUtil.killCFG(node);
-                if (survivingSuccessor.isAlive() && survivingSuccessor instanceof BeginNode) {
-                    undoOperations.add(() -> ((BeginNode) survivingSuccessor).trySimplify());
+                if (survivingSuccessor instanceof BeginNode) {
+                    undoOperations.add(() -> {
+                        if (survivingSuccessor.isAlive()) {
+                            ((BeginNode) survivingSuccessor).trySimplify();
+                        }
+                    });
                 }
                 return true;
             });