Mercurial > hg > truffle
comparison graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java @ 4621:2ab543f06630
Fix merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Thu, 16 Feb 2012 18:24:31 +0100 |
parents | bd8aca42516f |
children | 00e01f401c03 |
comparison
equal
deleted
inserted
replaced
4620:bd8aca42516f | 4621:2ab543f06630 |
---|---|
200 for (int i = 0; i < node.blockSuccessorCount(); i++) { | 200 for (int i = 0; i < node.blockSuccessorCount(); i++) { |
201 node.setBlockSuccessor(i, null); | 201 node.setBlockSuccessor(i, null); |
202 } | 202 } |
203 node.replaceAtPredecessors(next); | 203 node.replaceAtPredecessors(next); |
204 node.safeDelete(); | 204 node.safeDelete(); |
205 begin.safeDelete(); | |
205 } | 206 } |
206 | 207 |
207 public void removeSplitPropagate(ControlSplitNode node, int survivingSuccessor) { | 208 public void removeSplitPropagate(ControlSplitNode node, int survivingSuccessor) { |
208 assert node != null; | 209 assert node != null; |
209 assert node.usages().isEmpty(); | 210 assert node.usages().isEmpty(); |