Mercurial > hg > graal-compiler

changeset 22997:4c616f79b858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix application of RemoveValueProxyPhase in normal and economy configurations.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 17 Nov 2015 01:37:53 +0100
parents 1fb858f97559
children e383595f122b
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyLowTier.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EconomyMidTier.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java
diffstat 3 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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());
     }
 }
--- 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());
 
--- 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. */