Mercurial > hg > truffle
changeset 12505:0b0e60214f49
Merge.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 21 Oct 2013 18:37:19 +0200 |
| parents | 1d68b3962a10 (current diff) 249c54db0276 (diff) |
| children | 1be3cb11f88e |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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(); } }
--- 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
--- 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).