# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1435337171 -7200
# Node ID 33468b455bed0b52192c68776f8e45970efce09c
# Parent  cb7d2d509b0190820d3293a1d0be9bd620f54736# Parent  af7033393841eeef4e4a88a9237e367fab6014f2
Merge.

diff -r af7033393841 -r 33468b455bed graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java	Fri Jun 26 17:45:47 2015 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java	Fri Jun 26 18:46:11 2015 +0200
@@ -334,7 +334,7 @@
 
         if (invoke instanceof InvokeWithExceptionNode) {
             InvokeWithExceptionNode invokeWithException = ((InvokeWithExceptionNode) invoke);
-            if (unwindNode != null) {
+            if (unwindNode != null && unwindNode.isAlive()) {
                 assert unwindNode.predecessor() != null;
                 assert invokeWithException.exceptionEdge().successors().count() == 1;
                 ExceptionObjectNode obj = (ExceptionObjectNode) invokeWithException.exceptionEdge();
@@ -358,7 +358,7 @@
                 graph.removeFixed(begin);
             }
         } else {
-            if (unwindNode != null && !unwindNode.isDeleted()) {
+            if (unwindNode != null && unwindNode.isAlive()) {
                 DeoptimizeNode deoptimizeNode = graph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.NotCompiledExceptionHandler));
                 unwindNode.replaceAndDelete(deoptimizeNode);
             }