# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1430807918 25200
# Node ID bbaa8ee85da8128292d602a28ed5a927769c0f72
# Parent  25d71cc054e57f88547e4620ab4c34a036e53e0a
Delay LoadHub lowering until LowTier

diff -r 25d71cc054e5 -r bbaa8ee85da8 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ClassGetHubNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ClassGetHubNode.java	Mon May 04 23:36:12 2015 -0700
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ClassGetHubNode.java	Mon May 04 23:38:38 2015 -0700
@@ -75,7 +75,7 @@
             }
             if (clazz instanceof GetClassNode) {
                 GetClassNode getClass = (GetClassNode) clazz;
-                return new LoadHubNode(KlassPointerStamp.klass(), getClass.getObject(), null);
+                return new LoadHubNode(KlassPointerStamp.klassNonNull(), getClass.getObject(), null);
             }
             if (clazz instanceof HubGetClassNode) {
                 // replace _klass._java_mirror._klass -> _klass
diff -r 25d71cc054e5 -r bbaa8ee85da8 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java	Mon May 04 23:36:12 2015 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java	Mon May 04 23:38:38 2015 -0700
@@ -65,7 +65,7 @@
 
     @Override
     public void lower(LoweringTool tool) {
-        if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.HIGH_TIER) {
+        if (tool.getLoweringStage() != LoweringTool.StandardLoweringStage.LOW_TIER) {
             return;
         }
         tool.getLowerer().lower(this, tool);