# HG changeset patch # User Gilles Duboscq # Date 1382543458 -7200 # Node ID 37207d7e9056205a1000f0b763e09c3828041935 # Parent 7cf8b577b6e1d51ca5713b0fe846b4ae404875a7 Fix exception during canonicalization (GRAAL-554): when killing the branch following a FixedGuard, we can not count on this removing all of our usages because some of them may already be dead diff -r 7cf8b577b6e1 -r 37207d7e9056 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Wed Oct 23 16:51:01 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Wed Oct 23 17:50:58 2013 +0200 @@ -99,9 +99,8 @@ DeoptimizeNode deopt = graph().add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, reason)); deopt.setDeoptimizationState(getDeoptimizationState()); setNext(deopt); - } else { - this.replaceAtUsages(null); } + this.replaceAtUsages(null); graph().removeFixed(this); } }