Mercurial > hg > truffle
changeset 19167:ce23018b970a
rename: makeNonNull -> nullCheckedValue
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 06 Feb 2015 12:11:22 +0100 |
| parents | d4f80cf249d0 |
| children | 32c7a5a88523 |
| files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotGraphBuilderPluginsProvider.java graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderContext.java graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPluginsProvider.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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); }
--- 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; }
--- 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));