# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1447720673 -3600
# Node ID 4c616f79b858bc1b11158072c7333283f1d31dad
# Parent  1fb858f9755995e7f4eaf7ad4849900b5b2b4596
Fix application of RemoveValueProxyPhase in normal and economy configurations.

diff -r 1fb858f97559 -r 4c616f79b858 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyLowTier.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyLowTier.java	Tue Nov 17 00:22:37 2015 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyLowTier.java	Tue Nov 17 01:37:53 2015 +0100
@@ -29,7 +29,6 @@
 import com.oracle.graal.phases.common.CanonicalizerPhase;
 import com.oracle.graal.phases.common.ExpandLogicPhase;
 import com.oracle.graal.phases.common.LoweringPhase;
-import com.oracle.graal.phases.common.RemoveValueProxyPhase;
 import com.oracle.graal.phases.tiers.LowTierContext;
 
 public class EconomyLowTier extends PhaseSuite<LowTierContext> {
@@ -43,6 +42,5 @@
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER));
 
         appendPhase(new ExpandLogicPhase());
-        appendPhase(new RemoveValueProxyPhase());
     }
 }
diff -r 1fb858f97559 -r 4c616f79b858 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyMidTier.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyMidTier.java	Tue Nov 17 00:22:37 2015 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyMidTier.java	Tue Nov 17 01:37:53 2015 +0100
@@ -31,6 +31,7 @@
 import com.oracle.graal.phases.common.GuardLoweringPhase;
 import com.oracle.graal.phases.common.LoopSafepointInsertionPhase;
 import com.oracle.graal.phases.common.LoweringPhase;
+import com.oracle.graal.phases.common.RemoveValueProxyPhase;
 import com.oracle.graal.phases.tiers.MidTierContext;
 
 public class EconomyMidTier extends PhaseSuite<MidTierContext> {
@@ -40,6 +41,7 @@
         if (ImmutableCode.getValue()) {
             canonicalizer.disableReadCanonicalization();
         }
+        appendPhase(new RemoveValueProxyPhase());
 
         appendPhase(new LoopSafepointInsertionPhase());
 
diff -r 1fb858f97559 -r 4c616f79b858 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java	Tue Nov 17 00:22:37 2015 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java	Tue Nov 17 01:37:53 2015 +0100
@@ -39,7 +39,6 @@
 import com.oracle.graal.phases.common.IterativeConditionalEliminationPhase;
 import com.oracle.graal.phases.common.LoweringPhase;
 import com.oracle.graal.phases.common.ProfileCompiledMethodsPhase;
-import com.oracle.graal.phases.common.RemoveValueProxyPhase;
 import com.oracle.graal.phases.common.UseTrappingNullChecksPhase;
 import com.oracle.graal.phases.common.instrumentation.InlineInstrumentationPhase;
 import com.oracle.graal.phases.tiers.LowTierContext;
@@ -70,8 +69,6 @@
             appendPhase(new InlineInstrumentationPhase());
         }
 
-        appendPhase(new RemoveValueProxyPhase());
-
         appendPhase(new ExpandLogicPhase());
 
         /* Cleanup IsNull checks resulting from MID_TIER/LOW_TIER lowering and ExpandLogic phase. */