Mercurial > hg > graal-jvmci-8
changeset 10671:69089865435a
New lowering phase after framestate assignment.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Tue, 09 Jul 2013 11:58:03 +0200 |
parents | 5bab3272bb82 |
children | 853a894e0d97 |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/WriteBarrier.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java |
diffstat | 5 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java Tue Jul 09 11:58:02 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java Tue Jul 09 11:58:03 2013 +0200 @@ -30,9 +30,7 @@ public class LowTier extends PhaseSuite<LowTierContext> { public LowTier() { - appendPhase(new LoweringPhase(LoweringType.AFTER_GUARDS)); - - appendPhase(new FrameStateAssignmentPhase()); + appendPhase(new LoweringPhase(LoweringType.AFTER_FSA)); appendPhase(new ExpandLogicPhase());
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java Tue Jul 09 11:58:02 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java Tue Jul 09 11:58:03 2013 +0200 @@ -25,6 +25,7 @@ import static com.oracle.graal.phases.GraalOptions.*; import com.oracle.graal.loop.phases.*; +import com.oracle.graal.nodes.spi.Lowerable.LoweringType; import com.oracle.graal.phases.*; import com.oracle.graal.phases.common.*; import com.oracle.graal.phases.tiers.*; @@ -77,6 +78,10 @@ appendPhase(new GuardLoweringPhase()); + appendPhase(new LoweringPhase(LoweringType.AFTER_GUARDS)); + + appendPhase(new FrameStateAssignmentPhase()); + if (OptCanonicalizer.getValue()) { appendPhase(canonicalizer); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Tue Jul 09 11:58:02 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Tue Jul 09 11:58:03 2013 +0200 @@ -767,15 +767,15 @@ } else if (n instanceof InstanceOfDynamicNode) { instanceofSnippets.lower((InstanceOfDynamicNode) n, tool); } else if (n instanceof NewInstanceNode) { - if (tool.getLoweringType() == LoweringType.AFTER_GUARDS) { + if (tool.getLoweringType() == LoweringType.AFTER_FSA) { newObjectSnippets.lower((NewInstanceNode) n); } } else if (n instanceof NewArrayNode) { - if (tool.getLoweringType() == LoweringType.AFTER_GUARDS) { + if (tool.getLoweringType() == LoweringType.AFTER_FSA) { newObjectSnippets.lower((NewArrayNode) n); } } else if (n instanceof DynamicNewArrayNode) { - if (tool.getLoweringType() == LoweringType.AFTER_GUARDS) { + if (tool.getLoweringType() == LoweringType.AFTER_FSA) { newObjectSnippets.lower((DynamicNewArrayNode) n); } } else if (n instanceof MonitorEnterNode) { @@ -799,7 +799,7 @@ } else if (n instanceof G1ArrayRangePostWriteBarrier) { writeBarrierSnippets.lower((G1ArrayRangePostWriteBarrier) n, tool); } else if (n instanceof NewMultiArrayNode) { - if (tool.getLoweringType() == LoweringType.AFTER_GUARDS) { + if (tool.getLoweringType() == LoweringType.AFTER_FSA) { newObjectSnippets.lower((NewMultiArrayNode) n); } } else if (n instanceof LoadExceptionObjectNode) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/WriteBarrier.java Tue Jul 09 11:58:02 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/WriteBarrier.java Tue Jul 09 11:58:03 2013 +0200 @@ -54,7 +54,7 @@ @Override public void lower(LoweringTool generator, LoweringType loweringType) { - assert loweringType == LoweringType.AFTER_GUARDS; + assert loweringType == LoweringType.AFTER_FSA; generator.getRuntime().lower(this, generator); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Tue Jul 09 11:58:02 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Lowerable.java Tue Jul 09 11:58:03 2013 +0200 @@ -25,7 +25,7 @@ public interface Lowerable { public enum LoweringType { - BEFORE_GUARDS, AFTER_GUARDS + BEFORE_GUARDS, AFTER_GUARDS, AFTER_FSA } void lower(LoweringTool tool, LoweringType loweringType);