# HG changeset patch # User Gilles Duboscq # Date 1415269779 -3600 # Node ID 2a604849b3e6e16f106cd9e440e9992972977f26 # Parent fa6c97ede679c14ad93149bbdb4d4ec747bbdd13 Since edge nullness is now verified using @OptionalInput, remove replace-with-null assert in replaceFloating diff -r fa6c97ede679 -r 2a604849b3e6 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Wed Nov 05 22:18:55 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Thu Nov 06 11:29:39 2014 +0100 @@ -260,7 +260,7 @@ } public void replaceFloating(FloatingNode node, Node replacement) { - assert node != null && replacement != null && node.isAlive() && replacement.isAlive() : "cannot replace " + node + " with " + replacement; + assert node != null && node.isAlive() && (replacement == null || replacement.isAlive()) : "cannot replace " + node + " with " + replacement; node.replaceAtUsages(replacement); node.safeDelete(); }