Mercurial > hg > graal-compiler
changeset 5445:645534f5e4ab
Transmit null check flag from fixed to floating read nodes
remove obsolete Lower flag
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Thu, 24 May 2012 16:22:26 +0200 |
parents | f46fee826f7f |
children | fafab5f0507d |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/FloatingReadPhase.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java |
diffstat | 4 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed May 23 15:28:17 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu May 24 16:22:26 2012 +0200 @@ -175,14 +175,12 @@ if (GraalOptions.CullFrameStates) { new CullFrameStatesPhase().apply(graph); } - if (GraalOptions.Lower) { - new FloatingReadPhase().apply(graph); - if (GraalOptions.OptGVN) { - new GlobalValueNumberingPhase().apply(graph); - } - if (GraalOptions.OptReadElimination) { - new ReadEliminationPhase().apply(graph); - } + new FloatingReadPhase().apply(graph); + if (GraalOptions.OptGVN) { + new GlobalValueNumberingPhase().apply(graph); + } + if (GraalOptions.OptReadElimination) { + new ReadEliminationPhase().apply(graph); } if (GraalOptions.PropagateTypes) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java Wed May 23 15:28:17 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java Thu May 24 16:22:26 2012 +0200 @@ -37,7 +37,6 @@ // Checkstyle: resume public static int Threads = 4; - public static boolean Lower = true; // inlining settings public static boolean Inline = true;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/FloatingReadPhase.java Wed May 23 15:28:17 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/FloatingReadPhase.java Thu May 24 16:22:26 2012 +0200 @@ -153,6 +153,7 @@ } else { floatingRead = graph.unique(new FloatingReadNode(readNode.object(), readNode.location(), getLocationForRead(readNode), readNode.stamp(), readNode.dependencies())); } + floatingRead.setNullCheck(readNode.getNullCheck()); ValueAnchorNode anchor = null; for (GuardNode guard : readNode.dependencies().filter(GuardNode.class)) { if (anchor == null) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Wed May 23 15:28:17 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Thu May 24 16:22:26 2012 +0200 @@ -270,9 +270,6 @@ @Override public void lower(Node n, CiLoweringTool tool) { - if (!GraalOptions.Lower) { - return; - } StructuredGraph graph = (StructuredGraph) n.graph(); if (n instanceof ArrayLengthNode) {