# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1423223090 -3600
# Node ID d599eeab1b532695ad55e6185664dbadaa5bb51f
# Parent  32c7a5a88523a07fb750bad3a8cc1393fb022e1d# Parent  39e99cf01468d46929237d49e15889eb0d491f6b
Merge.

diff -r 39e99cf01468 -r d599eeab1b53 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotGraphBuilderPluginsProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotGraphBuilderPluginsProvider.java	Thu Feb 05 19:35:29 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotGraphBuilderPluginsProvider.java	Fri Feb 06 12:44:50 2015 +0100
@@ -50,7 +50,7 @@
                     mirror = builder.append(ConstantNode.forConstant(objectStamp.type().getJavaClass(), metaAccess));
                 } else {
                     StampProvider stampProvider = builder.getStampProvider();
-                    LoadHubNode hub = builder.append(new LoadHubNode(stampProvider, makeNonNull(builder, rcvr)));
+                    LoadHubNode hub = builder.append(new LoadHubNode(stampProvider, nullCheckedValue(builder, rcvr)));
                     mirror = builder.append(new HubGetClassNode(builder.getMetaAccess(), hub));
                 }
                 builder.push(Kind.Object, mirror);
diff -r 39e99cf01468 -r d599eeab1b53 graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderContext.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderContext.java	Thu Feb 05 19:35:29 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderContext.java	Fri Feb 06 12:44:50 2015 +0100
@@ -50,10 +50,10 @@
     void push(Kind kind, ValueNode value);
 
     /**
-     * @see GuardingPiNode#makeNonNull(ValueNode)
+     * @see GuardingPiNode#nullCheckedValue(ValueNode)
      */
-    static ValueNode makeNonNull(GraphBuilderContext builder, ValueNode value) {
-        ValueNode nonNullValue = GuardingPiNode.makeNonNull(value);
+    static ValueNode nullCheckedValue(GraphBuilderContext builder, ValueNode value) {
+        ValueNode nonNullValue = GuardingPiNode.nullCheckedValue(value);
         if (nonNullValue != value) {
             builder.append((FixedWithNextNode) nonNullValue);
         }
diff -r 39e99cf01468 -r d599eeab1b53 graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPluginsProvider.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPluginsProvider.java	Thu Feb 05 19:35:29 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPluginsProvider.java	Fri Feb 06 12:44:50 2015 +0100
@@ -88,7 +88,7 @@
         }
 
         public boolean apply(GraphBuilderContext builder, ValueNode value) {
-            builder.push(kind.getStackKind(), builder.append(new UnboxNode(makeNonNull(builder, value), kind)));
+            builder.push(kind.getStackKind(), builder.append(new UnboxNode(nullCheckedValue(builder, value), kind)));
             return true;
         }
 
diff -r 39e99cf01468 -r d599eeab1b53 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java	Thu Feb 05 19:35:29 2015 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java	Fri Feb 06 12:44:50 2015 +0100
@@ -74,7 +74,7 @@
      * non-null}. If {@code value} already has such a stamp, then it is returned. Otherwise a fixed
      * node guarding {@code value} is returned where the guard performs a null check.
      */
-    public static ValueNode makeNonNull(ValueNode value) {
+    public static ValueNode nullCheckedValue(ValueNode value) {
         ObjectStamp receiverStamp = (ObjectStamp) value.stamp();
         if (!StampTool.isPointerNonNull(receiverStamp)) {
             IsNullNode condition = value.graph().unique(new IsNullNode(value));
diff -r 39e99cf01468 -r d599eeab1b53 mx/mx_graal.py
--- a/mx/mx_graal.py	Thu Feb 05 19:35:29 2015 +0100
+++ b/mx/mx_graal.py	Fri Feb 06 12:44:50 2015 +0100
@@ -1481,17 +1481,24 @@
     vm(vmargs)
 
 def _basic_gate_body(args, tasks):
-    with Task('BuildHotSpotGraal: fastdebug,product', tasks):
-        buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product'])
+    # Build server-hosted-graal now so we can run the unit tests
+    with Task('BuildHotSpotGraalHosted: product', tasks):
+        buildvms(['--vms', 'server', '--builds', 'product'])
 
-    with VM('server', 'product'):  # hosted mode
+    # Run unit tests on server-hosted-graal
+    with VM('server', 'product'):
         with Task('UnitTests:hosted-product', tasks):
             unittest(['--enable-timing', '--verbose', '--fail-fast'])
 
-    with VM('server', 'product'):  # hosted mode
+    # Run baseline unit tests on server-hosted-graal
+    with VM('server', 'product'):
         with Task('UnitTests-BaselineCompiler:hosted-product', tasks):
             unittest(['--enable-timing', '--verbose', '--whitelist', 'test/whitelist_baseline.txt', '-G:+UseBaselineCompiler'])
 
+    # Build the other VM flavors
+    with Task('BuildHotSpotGraalOthers: fastdebug,product', tasks):
+        buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product'])
+
     with VM('graal', 'fastdebug'):
         with Task('BootstrapWithSystemAssertions:fastdebug', tasks):
             vm(['-esa', '-XX:-TieredCompilation', '-version'])