# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1453287553 -3600
# Node ID dd20a3a6b24f5bda3530514a8a7f837194830cb1
# Parent  859766efc59e1c8f85b6a108a958f18c8a6505f6
TraceRA: improve assertion in TraceBuilderResult.

diff -r 859766efc59e -r dd20a3a6b24f graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilderResult.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilderResult.java	Wed Jan 20 11:58:32 2016 +0100
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilderResult.java	Wed Jan 20 11:59:13 2016 +0100
@@ -77,9 +77,12 @@
         assert verifyAllBlocksScheduled(traceBuilderResult, expectedLength) : "Not all blocks assigned to traces!";
         for (Trace<T> trace : traces) {
             T last = null;
+            int blockNumber = 0;
             for (T current : trace.getBlocks()) {
-                assert last == null || current.getPredecessors().contains(last);
+                assert last == null || current.getPredecessors().contains(last) : "Last block (" + last + ") not a predecessor of " + current;
+                assert current.getLinearScanNumber() == blockNumber : "Blocks not numbered correctly: " + current.getLinearScanNumber() + " vs. " + blockNumber;
                 last = current;
+                blockNumber++;
             }
         }
         return true;
@@ -90,6 +93,7 @@
         BitSet handled = new BitSet(expectedLength);
         for (Trace<T> trace : traces) {
             for (T block : trace.getBlocks()) {
+                assert !handled.get(block.getId()) : "Block added twice: " + block;
                 handled.set(block.getId());
             }
         }