Mercurial > hg > truffle

changeset 10949:8ede7cd7318e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Fri, 02 Aug 2013 17:00:40 +0200
parents 46c6ee6f1832 (current diff) 4c648c43150c (diff)
children d2187f88cdd2
files
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java	Fri Aug 02 14:53:08 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java	Fri Aug 02 17:00:40 2013 +0200
@@ -84,16 +84,18 @@
     public void simplify(SimplifierTool tool) {
         if (condition instanceof LogicConstantNode) {
             LogicConstantNode c = (LogicConstantNode) condition;
-            if (c.getValue() != negated) {
-                this.replaceAtUsages(BeginNode.prevBegin(this));
-                graph().removeFixed(this);
-            } else {
-                FixedWithNextNode predecessor = (FixedWithNextNode) predecessor();
+            if (c.getValue() == negated) {
+                FixedNode next = this.next();
+                if (next != null) {
+                    tool.deleteBranch(next);
+                }
+
                 DeoptimizeNode deopt = graph().add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, reason));
                 deopt.setDeoptimizationState(getDeoptimizationState());
-                tool.deleteBranch(this);
-                predecessor.setNext(deopt);
+                setNext(deopt);
             }
+            this.replaceAtUsages(BeginNode.prevBegin(this));
+            graph().removeFixed(this);
         }
     }