# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1328653808 -3600
# Node ID f14ac97af98f554226267a2a344e96211feb4b2c
# Parent  2bb876c23a4faaf53f82de7f945c59ad95167fb8# Parent  2dfc57827678d799ebf724115b6fb9e328c20c56
Merge.

diff -r 2bb876c23a4f -r f14ac97af98f graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java	Tue Feb 07 23:29:47 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java	Tue Feb 07 23:30:08 2012 +0100
@@ -87,7 +87,7 @@
                             graph.removeFloating((FloatingNode) node);
                         } else {
                             // case 2
-                            assert canonical instanceof FloatingNode || (canonical instanceof FixedNode && canonical.predecessor() != null) : node + " -> " + canonical +
+                            assert !(canonical instanceof FixedNode) || canonical.predecessor() != null : node + " -> " + canonical +
                                             " : replacement should be floating or fixed and connected";
                             graph.replaceFloating((FloatingNode) node, canonical);
                         }