Mercurial > hg > graal-compiler
comparison 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 |
comparison
equal
deleted
inserted
replaced
2752:0d268cf66e24 | 2753:dbb4c8b6d5cd |
---|---|
77 return (BlockBegin) successors().get(super.successorCount() + SUCCESSOR_COUNT + index); | 77 return (BlockBegin) successors().get(super.successorCount() + SUCCESSOR_COUNT + index); |
78 } | 78 } |
79 | 79 |
80 public Instruction setBlockSuccessor(int index, Instruction n) { | 80 public Instruction setBlockSuccessor(int index, Instruction n) { |
81 assert index >= 0 && index < blockSuccessorCount; | 81 assert index >= 0 && index < blockSuccessorCount; |
82 assert n instanceof BlockBegin : "only BlockBegins, for now..."; | 82 assert n == null || n instanceof BlockBegin : "only BlockBegins, for now... " + n.getClass(); |
83 return (BlockBegin) successors().set(super.successorCount() + SUCCESSOR_COUNT + index, n); | 83 return (BlockBegin) successors().set(super.successorCount() + SUCCESSOR_COUNT + index, n); |
84 } | 84 } |
85 | 85 |
86 public int blockSuccessorCount() { | 86 public int blockSuccessorCount() { |
87 return blockSuccessorCount; | 87 return blockSuccessorCount; |