Mercurial > hg > truffle

changeset 6672:abd5b49a26fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for Canonicalizer : accespt replacement of a floating node by a merge node
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 07 Nov 2012 14:13:11 +0100
parents bffb038abbe6
children e75c3dd32c5b
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Wed Nov 07 13:20:49 2012 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Wed Nov 07 14:13:11 2012 +0100
@@ -210,7 +210,7 @@
                                 graph.removeFloating((FloatingNode) node);
                             } else {
                                 // case 2
-                                assert !(canonical instanceof FixedNode) || (canonical.predecessor() != null || canonical instanceof StartNode) : node + " -> " + canonical +
+                                assert !(canonical instanceof FixedNode) || (canonical.predecessor() != null || canonical instanceof StartNode || canonical instanceof MergeNode) : node + " -> " + canonical +
                                                 " : replacement should be floating or fixed and connected";
                                 graph.replaceFloating((FloatingNode) node, canonical);
                             }