Mercurial > hg > graal-compiler
changeset 23068:6ec93a8e8f1a
Fix for control flow graph calculation.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 23 Nov 2015 23:31:31 +0100 |
parents | a9f8295094c3 |
children | deb6336662b6 048985854416 |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Mon Nov 23 17:11:39 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Mon Nov 23 23:31:31 2015 +0100 @@ -297,7 +297,7 @@ } } - if (graph.hasValueProxies()) { + if (graph.getGuardsStage() != GuardsStage.AFTER_FSA) { // The following loop can add new blocks to the end of the loop's block list. int size = loop.getBlocks().size(); for (int i = 0; i < size; ++i) { @@ -353,7 +353,7 @@ if (block.getLoop() == loop) { nextState = stepOut; } else { - assert block.loop == loop.getParent(); + assert block.loop == loop.getParent() : block; block.loop = c.loop; assert !c.loop.getBlocks().contains(block);