# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1418952449 -3600
# Node ID a49e0ed940c2cf0e9aa830d6dd5870e50cf1f846
# Parent  d5ea82229f01fa6bd915dfeb60a248fd25ca9ee9
Back out changeset d747b9e5695c

diff -r d5ea82229f01 -r a49e0ed940c2 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	Thu Dec 18 14:11:56 2014 -0800
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Fri Dec 19 02:27:29 2014 +0100
@@ -51,7 +51,6 @@
     private static final DebugMetric metricNullCheckRemoved = Debug.metric("NullCheckRemoved");
     private static final DebugMetric metricObjectEqualsRemoved = Debug.metric("ObjectEqualsRemoved");
     private static final DebugMetric metricGuardsRemoved = Debug.metric("GuardsRemoved");
-    private static final DebugMetric metricShortCircuitOrRemoved = Debug.metric("ShortCircuitOrRemoved");
 
     private StructuredGraph graph;
 
@@ -634,16 +633,6 @@
                         metricObjectEqualsRemoved.increment();
                         return trueValue;
                     }
-                } else if (condition instanceof ShortCircuitOrNode) {
-                    ShortCircuitOrNode shortCircuitOr = (ShortCircuitOrNode) condition;
-                    T xResult = evaluateCondition(shortCircuitOr.getX(), trueValue, falseValue);
-                    if (xResult != null) {
-                        if (xResult == (shortCircuitOr.isXNegated() ? trueValue : falseValue)) {
-                            // x condition is false => short circuit result is false
-                            metricShortCircuitOrRemoved.increment();
-                            return falseValue;
-                        }
-                    }
                 }
             }
             return null;