Mercurial > hg > graal-jvmci-8

changeset 22107:33468b455bed

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, 26 Jun 2015 18:46:11 +0200
parents cb7d2d509b01 (diff) af7033393841 (current diff)
children 51ceda0cf404
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
             }