# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1382369801 -7200
# Node ID 249c54db027617e9294c9d594cb71132bb9b22f6
# Parent  d00c31d8394fa395e2342a8b8f7404d2acc8dc00# Parent  98caa3872d83a3fc044000385c4c076a573f5015
Merge

diff -r d00c31d8394f -r 249c54db0276 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java	Mon Oct 21 17:21:26 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java	Mon Oct 21 17:36:41 2013 +0200
@@ -91,9 +91,7 @@
     @Override
     public boolean verify() {
         Node lla = lastLocationAccess();
-        if (lla != null && !(isMemoryCheckPoint(lla) || isMemoryPhi(lla) || isMemoryProxy(lla))) {
-            assert false : "lastLocationAccess of " + this + " should be a MemoryCheckpoint, but is " + lla;
-        }
+        assert lla == null || isMemoryCheckPoint(lla) || isMemoryPhi(lla) || isMemoryProxy(lla) : "lastLocationAccess of " + this + " should be a MemoryCheckpoint, but is " + lla;
         return super.verify();
     }
 }
diff -r d00c31d8394f -r 249c54db0276 mx/commands.py
--- a/mx/commands.py	Mon Oct 21 17:21:26 2013 +0200
+++ b/mx/commands.py	Mon Oct 21 17:36:41 2013 +0200
@@ -989,8 +989,8 @@
     global _jacoco
     _jacoco = 'off'
 
-    t = Task('CleanAndBuildGraalVisualizer')
-    mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build'])
+    t = Task('CleanAndBuildIdealGraphVisualizer')
+    mx.run(['ant', '-f', join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml'), '-q', 'clean', 'build'])
     tasks.append(t.stop())
 
     # Prevent Graal modifications from breaking the standard builds