Mercurial > hg > truffle

changeset 8276:0269ef50021f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix convert deoptimize to guard phase.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 14 Mar 2013 12:19:01 +0100
parents db00ce461a51
children 2ddf84436009 1756b12d2246 ad4f977b49ce
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
         }
     }
 }