# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1386795430 -3600
# Node ID d64c0112fb947d950f72552de10bb61039b607ad
# Parent  5a3491b0c2f001493d332ac3a592955ed69c3b36# Parent  d2165b699e0f9c6eceb9345a8b88a4ef04a4bb3c
Merge.

diff -r d2165b699e0f -r d64c0112fb94 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
--- 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;
     }