# HG changeset patch # User Gilles Duboscq # Date 1382528510 -7200 # Node ID 97f56b7e978e824549e1e8ddc923416ba66b4eae # Parent ae36dae46d50391e7c27e78869819b2ded1857dd Fix NPE in OptimizeGuardAnchors diff -r ae36dae46d50 -r 97f56b7e978e graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/OptimizeGuardAnchors.java --- 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 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();