# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1337869346 -7200
# Node ID 645534f5e4ab9f1f45331f8389150d8fdf646073
# Parent  f46fee826f7f1977f7c597d57f98171c765f4221
Transmit null check flag from fixed to floating read nodes
remove obsolete Lower flag

diff -r f46fee826f7f -r 645534f5e4ab graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
--- 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) {
diff -r f46fee826f7f -r 645534f5e4ab graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalOptions.java
--- 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;
diff -r f46fee826f7f -r 645534f5e4ab graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/FloatingReadPhase.java
--- 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) {
diff -r f46fee826f7f -r 645534f5e4ab graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java
--- 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) {