# HG changeset patch # User Thomas Wuerthinger # Date 1363259941 -3600 # Node ID 0269ef50021f267cc13d1b4b1a55ba91be0809bf # Parent db00ce461a513d682b89d5d532d591a43a4138f1 Fix convert deoptimize to guard phase. diff -r db00ce461a51 -r 0269ef50021f graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Thu Mar 14 01:14:23 2013 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Thu Mar 14 12:19:01 2013 +0100 @@ -84,19 +84,18 @@ // InstanceOfNode. Relax this restriction. return; } + FixedGuardNode guard = graph.add(new FixedGuardNode(conditionNode, deopt.reason(), deopt.action(), deoptBegin == ifNode.trueSuccessor())); FixedWithNextNode pred = (FixedWithNextNode) ifNode.predecessor(); - boolean negated = false; if (deoptBegin == ifNode.trueSuccessor()) { - negated = true; graph.removeSplitPropagate(ifNode, ifNode.falseSuccessor()); } else { graph.removeSplitPropagate(ifNode, ifNode.trueSuccessor()); } Debug.log("Converting %s on %-5s branch of %s to guard for remaining branch %s.", deopt, deoptBegin == ifNode.trueSuccessor() ? "true" : "false", ifNode, otherBegin); - FixedGuardNode guard = graph.add(new FixedGuardNode(conditionNode, deopt.reason(), deopt.action(), negated)); FixedNode next = pred.next(); pred.setNext(guard); guard.setNext(next); + Debug.dump(graph, "After introducing fixed guard %s", guard); } } }