# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1352293991 -3600
# Node ID abd5b49a26fd7190a28a7e161c2e95fd175734ae
# Parent  bffb038abbe6e5fc5238d616a6801872d2ee400e
Fix for Canonicalizer : accespt replacement of a floating node by a merge node

diff -r bffb038abbe6 -r abd5b49a26fd graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java
--- 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);
                             }