Mercurial > hg > truffle

changeset 14721:ede5735ed267

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deal with deleted ends in ConvertDeoptimizeToGuardPhase
author Lukas Stadler <lukas.stadler@oracle.com>
date Mon, 24 Mar 2014 10:45:24 +0100
parents af7b9b9a9a28
children 8dfd3f53ba4a
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java	Mon Mar 24 09:40:29 2014 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java	Mon Mar 24 10:45:24 2014 +0100
@@ -88,6 +88,9 @@
                     }
                     for (int i = 0; i < mergePredecessors.size(); ++i) {
                         AbstractEndNode mergePredecessor = mergePredecessors.get(i);
+                        if (!mergePredecessor.isAlive()) {
+                            break;
+                        }
                         if (xs[i] == null) {
                             continue;
                         }