# HG changeset patch # User Gilles Duboscq # Date 1327621226 -3600 # Node ID b801d2f9e2b08c975309bdc8d4b3be8e894a5cd6 # Parent b5c12b21879cc61581704f407afa4780f69ab861 Fix NPE in FixedGuardNode's simplify diff -r b5c12b21879c -r b801d2f9e2b0 graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/FixedGuardNode.java --- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/FixedGuardNode.java Fri Jan 27 00:27:10 2012 +0100 +++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/FixedGuardNode.java Fri Jan 27 00:40:26 2012 +0100 @@ -61,10 +61,10 @@ conditions.remove(n); } else { FixedNode next = this.next(); - setNext(graph().add(new DeoptimizeNode(DeoptAction.InvalidateRecompile))); if (next != null) { tool.deleteBranch(next); } + setNext(graph().add(new DeoptimizeNode(DeoptAction.InvalidateRecompile))); return; } }