Mercurial > hg > truffle
changeset 20931:033dd4494705
Fix compare in LoweringPhase.processBlock
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Tue, 14 Apr 2015 17:23:37 +0200 |
parents | 143c532a550e |
children | 5ad8a163b843 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java |
diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Tue Apr 14 14:05:35 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Tue Apr 14 17:23:37 2015 +0200 @@ -144,7 +144,6 @@ public void processBlock(Block startBlock) { LoweringPhase.processBlock(new InstanceFrame(startBlock, null)); - } public class InstanceFrame extends LoweringPhase.Frame<InstanceFrame> {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Tue Apr 14 14:05:35 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Tue Apr 14 17:23:37 2015 +0200 @@ -396,7 +396,7 @@ * if (alwaysReachedBlock != null && alwaysReachedBlock.getDominator() == block) { * processBlock(alwaysReachedBlock); * } - * + * * // Now go for the other dominators. * for (Block dominated : block.getDominated()) { * if (dominated != alwaysReachedBlock) { @@ -421,7 +421,7 @@ f.preprocess(); nextState = state == ST_PROCESS_ALWAYS_REACHED ? ST_ENTER : ST_ENTER_ALWAYS_REACHED; } else if (state == ST_ENTER_ALWAYS_REACHED) { - if (f.alwaysReachedBlock != null && f.alwaysReachedBlock == f.block) { + if (f.alwaysReachedBlock != null && f.alwaysReachedBlock.getDominator() == f.block) { f = f.enterAlwaysReached(f.alwaysReachedBlock); nextState = ST_PROCESS; } else {