src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.word/src/org/graalvm/compiler/word/WordCastNode.java

rev 52509 : [mq]: graal

@@ -26,11 +26,10 @@
 
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
 
 import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
 import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.ObjectStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;

@@ -138,12 +137,29 @@
         return StampFactory.object();
     }
 
     @Override
     public boolean inferStamp() {
-        if (stamp.equals(StampFactory.object())) {
-            return updateStamp(objectStampFor(input));
+        if (stamp instanceof AbstractPointerStamp) {
+            AbstractPointerStamp objectStamp = (AbstractPointerStamp) stamp;
+            if (!objectStamp.alwaysNull() && !objectStamp.nonNull()) {
+                Stamp newStamp = stamp;
+                Stamp inputStamp = input.stamp(NodeView.DEFAULT);
+                if (inputStamp instanceof AbstractPointerStamp) {
+                    AbstractPointerStamp pointerStamp = (AbstractPointerStamp) inputStamp;
+                    if (pointerStamp.alwaysNull()) {
+                        newStamp = objectStamp.asAlwaysNull();
+                    } else if (pointerStamp.nonNull()) {
+                        newStamp = objectStamp.asNonNull();
+                    }
+                } else if (inputStamp instanceof IntegerStamp && !((IntegerStamp) inputStamp).contains(0)) {
+                    newStamp = objectStamp.asNonNull();
+                } else if (input.isConstant() && isZeroConstant(input)) {
+                    newStamp = objectStamp.asAlwaysNull();
+                }
+                return updateStamp(newStamp);
+            }
         }
         return false;
     }
 
     @Override

@@ -151,17 +167,17 @@
         if (tool.allUsagesAvailable() && hasNoUsages()) {
             /* If the cast is unused, it can be eliminated. */
             return input;
         }
 
-        assert !stamp(NodeView.DEFAULT).isCompatible(input.stamp(NodeView.DEFAULT));
+        assert !stamp.isCompatible(input.stamp(NodeView.DEFAULT));
         if (input.isConstant()) {
             /* Null pointers are uncritical for GC, so they can be constant folded. */
             if (input.asJavaConstant().isNull()) {
-                return ConstantNode.forIntegerStamp(stamp(NodeView.DEFAULT), 0);
+                return ConstantNode.forIntegerStamp(stamp, 0);
             } else if (isZeroConstant(input)) {
-                return ConstantNode.forConstant(stamp(NodeView.DEFAULT), JavaConstant.NULL_POINTER, tool.getMetaAccess());
+                return ConstantNode.forConstant(stamp, ((AbstractPointerStamp) stamp).nullConstant(), tool.getMetaAccess());
             }
         }
 
         return this;
     }

@@ -181,11 +197,11 @@
             generator.setResult(this, value);
         } else {
             AllocatableValue result = generator.getLIRGeneratorTool().newVariable(kind);
             if (stamp.equals(StampFactory.object())) {
                 generator.getLIRGeneratorTool().emitConvertZeroToNull(result, value);
-            } else if (!trackedPointer && !((AbstractObjectStamp) input.stamp(NodeView.DEFAULT)).nonNull()) {
+            } else if (!trackedPointer && !((AbstractPointerStamp) input.stamp(NodeView.DEFAULT)).nonNull()) {
                 generator.getLIRGeneratorTool().emitConvertNullToZero(result, value);
             } else {
                 generator.getLIRGeneratorTool().emitMove(result, value);
             }
             generator.setResult(this, result);