# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1373991216 -7200
# Node ID 6d176112d16252142373dde61a90520ff14a5418
# Parent  ec4c7c33e8e5a4ca5018e8ded2634067e70d486d# Parent  c5354448464579acdf89e418c8db790fedd0c718
Merge.

diff -r ec4c7c33e8e5 -r 6d176112d162 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Tue Jul 16 18:13:20 2013 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Tue Jul 16 18:13:36 2013 +0200
@@ -491,6 +491,9 @@
                 for (GuardNode guard : begin.guards().snapshot()) {
                     registerGuard(guard);
                 }
+            } else if (node instanceof FixedGuardNode) {
+                FixedGuardNode guard = (FixedGuardNode) node;
+                registerCondition(!guard.isNegated(), guard.condition(), guard);
             } else if (node instanceof CheckCastNode) {
                 CheckCastNode checkCast = (CheckCastNode) node;
                 ValueNode object = checkCast.object();