# HG changeset patch # User Tom Rodriguez # Date 1422293387 28800 # Node ID 4ac00633d83c9cf409dcc6b0423c0a1c0618b280 # Parent 7e08e0de79a918d4ce4f4490b6d74d62535d1d96 Add some assertion messages diff -r 7e08e0de79a9 -r 4ac00633d83c graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java --- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Mon Jan 26 09:28:20 2015 -0800 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Mon Jan 26 09:29:47 2015 -0800 @@ -142,21 +142,21 @@ @Override protected void run(StructuredGraph graph) { - assert checkHighTierGraph(graph); + assert checkHighTierGraph(graph) : "failed HighTier graph check"; } }); ret.getMidTier().appendPhase(new Phase("CheckGraphPhase") { @Override protected void run(StructuredGraph graph) { - assert checkMidTierGraph(graph); + assert checkMidTierGraph(graph) : "failed MidTier graph check"; } }); ret.getLowTier().appendPhase(new Phase("CheckGraphPhase") { @Override protected void run(StructuredGraph graph) { - assert checkLowTierGraph(graph); + assert checkLowTierGraph(graph) : "failed LowTier graph check"; } }); return ret; diff -r 7e08e0de79a9 -r 4ac00633d83c graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Mon Jan 26 09:28:20 2015 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Mon Jan 26 09:29:47 2015 -0800 @@ -222,6 +222,7 @@ probability *= loopBegin.loopFrequency(); for (LoopEndNode predNode : loopBegin.orderedLoopEnds()) { Block predBlock = nodeToBlock.get(predNode); + assert predBlock != null : predNode; if (predBlock.getId() >= 0) { predecessors.add(predBlock); }