Mercurial > hg > graal-compiler
changeset 12499:249c54db0276
Merge
author | Christos Kotselidis <christos.kotselidis@oracle.com> |
---|---|
date | Mon, 21 Oct 2013 17:36:41 +0200 |
parents | d00c31d8394f (current diff) 98caa3872d83 (diff) |
children | 0b0e60214f49 |
files | |
diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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(); } }
--- 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