Mercurial > hg > truffle

changeset 16443:e941121f096f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
skip assertion in SchedulePhase for MemoryCheckpoint.Multi nodes
author Lukas Stadler <lukas.stadler@oracle.com>
date Tue, 08 Jul 2014 16:17:30 +0200
parents a6c3ea7ac369
children 843e8efacd13
files graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Tue Jul 08 16:17:13 2014 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Tue Jul 08 16:17:30 2014 +0200
@@ -1050,7 +1050,7 @@
             LocationIdentity readLocation = frn.location().getLocationIdentity();
             assert readLocation != FINAL_LOCATION;
             if (frn.getLastLocationAccess() == node) {
-                assert identity == ANY_LOCATION || readLocation == identity : "location doesn't match: " + readLocation + ", " + identity;
+                assert identity == ANY_LOCATION || readLocation == identity || node instanceof MemoryCheckpoint.Multi : "location doesn't match: " + readLocation + ", " + identity;
                 state.clearBeforeLastLocation(frn);
             } else if (!state.isBeforeLastLocation(frn) && (readLocation == identity || (node != getCFG().graph.start() && ANY_LOCATION == identity))) {
                 state.removeRead(frn);