Mercurial > hg > truffle

changeset 4518:f14ac97af98f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 07 Feb 2012 23:30:08 +0100
parents 2bb876c23a4f (current diff) 2dfc57827678 (diff)
children 9ad6d3d11630 3f7fac1bf082
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
                         }