# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1423221082 -3600
# Node ID ce23018b970a48c386dd9c1736eab14ab5e209e5
# Parent  d4f80cf249d0e04f613a5f94ee3f29b4d67bdd48
rename: makeNonNull -> nullCheckedValue

diff -r d4f80cf249d0 -r ce23018b970a 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 15:33:15 2015 -0800
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotGraphBuilderPluginsProvider.java	Fri Feb 06 12:11:22 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 d4f80cf249d0 -r ce23018b970a 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 15:33:15 2015 -0800
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderContext.java	Fri Feb 06 12:11:22 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 d4f80cf249d0 -r ce23018b970a 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 15:33:15 2015 -0800
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPluginsProvider.java	Fri Feb 06 12:11:22 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 d4f80cf249d0 -r ce23018b970a 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 15:33:15 2015 -0800
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java	Fri Feb 06 12:11:22 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));