# HG changeset patch
# User Christian Wirth <christian.wirth@oracle.com>
# Date 1432897324 -7200
# Node ID 772d5126b7962085d6aa1738df49921a648c5388
# Parent  f0300d851b16c89bbad20174454f49824de68cc9# Parent  6da76343d83025bdae640cadd814e17fa6b94e0f
Merged

diff -r f0300d851b16 -r 772d5126b796 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java	Fri May 29 13:01:09 2015 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java	Fri May 29 13:02:04 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;
             });