Mercurial > hg > truffle

changeset 13299:d64c0112fb94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 11 Dec 2013 21:57:10 +0100
parents 5a3491b0c2f0 (diff) d2165b699e0f (current diff)
children d5e65a244f7d
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Wed Dec 11 20:49:47 2013 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Wed Dec 11 21:57:10 2013 +0100
@@ -729,7 +729,11 @@
             }
         }
 
-        assert cdbc.block == null || earliestBlock(node).dominates(cdbc.block) : "failed to find correct latest schedule for " + node + ". cdbc: " + cdbc.block + ", earliest: " + earliestBlock(node);
+        if (assertionEnabled()) {
+            if (cdbc.block != null && !earliestBlock(node).dominates(cdbc.block)) {
+                throw new SchedulingError("failed to find correct latest schedule for %s. cdbc: %s, earliest: %s", node, cdbc.block, earliestBlock(node));
+            }
+        }
         return cdbc.block;
     }