Mercurial > hg > graal-compiler
changeset 21160:0c03a7b7081f
fix in DominatorConditionalEliminationPhase for If/ShortCircuitOr with xNegated=true
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Thu, 30 Apr 2015 13:26:24 +0200 |
parents | 3db205e86ef1 |
children | 5bf34f450660 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java |
diffstat | 1 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Thu Apr 30 13:26:24 2015 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Thu Apr 30 13:26:24 2015 +0200 @@ -40,7 +40,7 @@ import com.oracle.graal.nodes.java.*; import com.oracle.graal.nodes.util.*; import com.oracle.graal.phases.*; -import com.oracle.graal.phases.common.LoweringPhase.*; +import com.oracle.graal.phases.common.LoweringPhase.Frame; import com.oracle.graal.phases.schedule.*; public class DominatorConditionalEliminationPhase extends Phase { @@ -54,8 +54,8 @@ } private static final class InfoElement { - private Stamp stamp; - private ValueNode guard; + private final Stamp stamp; + private final ValueNode guard; public InfoElement(Stamp stamp, ValueNode guard) { this.stamp = stamp; @@ -69,10 +69,15 @@ public ValueNode getGuard() { return guard; } + + @Override + public String toString() { + return stamp + " -> " + guard; + } } private static final class Info { - private ArrayList<InfoElement> infos; + private final ArrayList<InfoElement> infos; public Info() { infos = new ArrayList<>(); @@ -267,7 +272,7 @@ } private void registerCondition(LogicNode condition, boolean negated, ValueNode guard, List<Runnable> undoOperations) { - this.registerNewStamp(condition, negated ? StampFactory.contradiction() : StampFactory.tautology(), guard, undoOperations); + registerNewStamp(condition, negated ? StampFactory.contradiction() : StampFactory.tautology(), guard, undoOperations); } private Iterable<InfoElement> getInfoElements(ValueNode proxiedValue) { @@ -368,11 +373,11 @@ if (this.loopExits.isEmpty()) { return tryProofCondition(shortCircuitOrNode.getX(), (guard, result) -> { if (result == !shortCircuitOrNode.isXNegated()) { - return rewireGuards(guard, result, rewireGuardFunction); + return rewireGuards(guard, true, rewireGuardFunction); } else { return tryProofCondition(shortCircuitOrNode.getY(), (innerGuard, innerResult) -> { if (innerGuard == guard) { - return rewireGuards(guard, shortCircuitOrNode.isYNegated() ? !innerResult : innerResult, rewireGuardFunction); + return rewireGuards(guard, innerResult ^ shortCircuitOrNode.isYNegated(), rewireGuardFunction); } return false; });