Mercurial > hg > graal-jvmci-8
diff graal/GraalCompiler/src/com/sun/c1x/ir/BlockEnd.java @ 2753:dbb4c8b6d5cd
Merge fix.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Fri, 20 May 2011 14:24:41 +0200 |
parents | 6048da340364 |
children | ca31e84ff154 |
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); }