Mercurial > hg > truffle

changeset 12539:97f56b7e978e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix NPE in OptimizeGuardAnchors
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 23 Oct 2013 13:41:50 +0200
parents ae36dae46d50
children 0aa37fd2f33e
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchors.java
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchors.java	Wed Oct 23 11:49:01 2013 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchors.java	Wed Oct 23 13:41:50 2013 +0200
@@ -89,10 +89,9 @@
         int successorCount = controlSplit.successors().count();
         List<GuardNode> otherGuards = new ArrayList<>(successorCount - 1);
         for (GuardNode guard : successor.guards().snapshot()) {
-            if (guard.condition().usages().count() < successorCount) {
+            if (guard.isDeleted() || guard.condition().usages().count() < successorCount) {
                 continue;
             }
-
             for (GuardNode conditonGuard : guard.condition().usages().filter(GuardNode.class)) {
                 if (conditonGuard != guard) {
                     GuardingNode conditonGuardAnchor = conditonGuard.getGuard();