# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1305894281 -7200
# Node ID dbb4c8b6d5cdb5cb2b396fb34775d6b0cc90bdc2
# Parent  0d268cf66e24e248a8f89fdc2c736de5d0705d2b
Merge fix.

diff -r 0d268cf66e24 -r dbb4c8b6d5cd graal/GraalCompiler/src/com/sun/c1x/ir/BlockEnd.java
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockEnd.java	Fri May 20 14:22:40 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockEnd.java	Fri May 20 14:24:41 2011 +0200
@@ -79,7 +79,7 @@
 
     public Instruction setBlockSuccessor(int index, Instruction n) {
         assert index >= 0 && index < blockSuccessorCount;
-        assert n instanceof BlockBegin : "only BlockBegins, for now...";
+        assert n == null || n instanceof BlockBegin : "only BlockBegins, for now... " + n.getClass();
         return (BlockBegin) successors().set(super.successorCount() + SUCCESSOR_COUNT + index, n);
     }