# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1382373439 -7200
# Node ID 0b0e60214f49939316312bad58b807e9d0ebb873
# Parent  1d68b3962a1093804e295c4a7adffe19d0e5aa3f# Parent  249c54db027617e9294c9d594cb71132bb9b22f6
Merge.

diff -r 1d68b3962a10 -r 0b0e60214f49 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 18:16:37 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java	Mon Oct 21 18:37:19 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 1d68b3962a10 -r 0b0e60214f49 mx/commands.py
--- a/mx/commands.py	Mon Oct 21 18:16:37 2013 +0200
+++ b/mx/commands.py	Mon Oct 21 18:37:19 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
diff -r 1d68b3962a10 -r 0b0e60214f49 src/share/vm/gc_interface/collectedHeap.cpp
--- a/src/share/vm/gc_interface/collectedHeap.cpp	Mon Oct 21 18:16:37 2013 +0200
+++ b/src/share/vm/gc_interface/collectedHeap.cpp	Mon Oct 21 18:37:19 2013 +0200
@@ -506,7 +506,7 @@
          " to threads list is doomed to failure!");
   for (JavaThread *thread = Threads::first(); thread; thread = thread->next()) {
      if (use_tlab) thread->tlab().make_parsable(retire_tlabs);
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(GRAAL)
      // The deferred store barriers must all have been flushed to the
      // card-table (or other remembered set structure) before GC starts
      // processing the card-table (or other remembered set).