# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1375455640 -7200
# Node ID 8ede7cd7318e2883f5f27e74b746adb9e1428293
# Parent  46c6ee6f1832e6d2cfebf4281f7d935ed9371c31# Parent  4c648c43150c0523c8e822843bf39bed9c2fc925
Merge

diff -r 46c6ee6f1832 -r 8ede7cd7318e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java
--- 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);
         }
     }