Mercurial > hg > truffle

changeset 18268:2a604849b3e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Since edge nullness is now verified using @OptionalInput, remove replace-with-null assert in replaceFloating
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 06 Nov 2014 11:29:39 +0100
parents fa6c97ede679
children b6c564739710 46e10fe1ade1
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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();
     }