Mercurial > hg > graal-compiler

changeset 2753:dbb4c8b6d5cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fix.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Fri, 20 May 2011 14:24:41 +0200
parents 0d268cf66e24
children e91608c2daff
files graal/GraalCompiler/src/com/sun/c1x/ir/BlockEnd.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
     }