Use enum for PiNode intrisify op

Author: Christian Wimmer

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java

@@ -32,8 +32,6 @@
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -49,6 +47,8 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
@@ -129,11 +129,11 @@ public Node canonical(CanonicalizerTool tool) {
     public static native KlassPointer readClass(Class<?> clazzNonNull);
 
     public static KlassPointer piCastNonNull(KlassPointer object, GuardingNode anchor) {
-        return intrinsifiedPiNode(object, anchor, PiNode.INTRINSIFY_OP_NON_NULL);
+        return intrinsifiedPiNode(object, anchor, PiNode.IntrinsifyOp.NON_NULL);
     }
 
     @NodeIntrinsic(PiNode.class)
-    private static native KlassPointer intrinsifiedPiNode(KlassPointer object, GuardingNode anchor, @ConstantNodeParameter int intrinsifyOp);
+    private static native KlassPointer intrinsifiedPiNode(KlassPointer object, GuardingNode anchor, @ConstantNodeParameter PiNode.IntrinsifyOp intrinsifyOp);
 
     @Override
     public ValueNode getValue() {

compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java

@@ -126,18 +126,20 @@ public static ValueNode create(ValueNode object, ValueNode guard) {
         return new PiNode(object, stamp, guard);
     }
 
-    public static final int INTRINSIFY_OP_NON_NULL = 1;
-    public static final int INTRINSIFY_OP_POSITIVE_INT = 2;
+    public enum IntrinsifyOp {
+        NON_NULL,
+        POSITIVE_INT
+    }
 
-    public static boolean intrinsify(GraphBuilderContext b, ValueNode input, ValueNode guard, int intrinsifyOp) {
+    public static boolean intrinsify(GraphBuilderContext b, ValueNode input, ValueNode guard, IntrinsifyOp intrinsifyOp) {
         Stamp piStamp;
         JavaKind pushKind;
         switch (intrinsifyOp) {
-            case INTRINSIFY_OP_NON_NULL:
+            case NON_NULL:
                 piStamp = AbstractPointerStamp.pointerNonNull(input.stamp(NodeView.DEFAULT));
                 pushKind = JavaKind.Object;
                 break;
-            case INTRINSIFY_OP_POSITIVE_INT:
+            case POSITIVE_INT:
                 piStamp = StampFactory.positiveInt();
                 pushKind = JavaKind.Int;
                 break;
@@ -324,33 +326,33 @@ public static Class<?> asNonNullObject(Object object) {
      *         {@code guard}
      */
     public static int piCastPositive(int value, GuardingNode guard) {
-        return intrinsified(value, guard, INTRINSIFY_OP_POSITIVE_INT);
+        return intrinsified(value, guard, IntrinsifyOp.POSITIVE_INT);
     }
 
     @NodeIntrinsic
-    private static native int intrinsified(int value, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
+    private static native int intrinsified(int value, GuardingNode guard, @ConstantNodeParameter IntrinsifyOp intrinsifyOp);
 
     /**
      * Changes the stamp of an object and ensures the newly stamped value is non-null and does not
      * float above a given guard.
      */
     public static Object piCastNonNull(Object object, GuardingNode guard) {
-        return intrinsified(object, guard, INTRINSIFY_OP_NON_NULL);
+        return intrinsified(object, guard, IntrinsifyOp.NON_NULL);
     }
 
     @NodeIntrinsic
-    private static native Object intrinsified(Object object, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
+    private static native Object intrinsified(Object object, GuardingNode guard, @ConstantNodeParameter IntrinsifyOp intrinsifyOp);
 
     /**
      * Changes the stamp of an object and ensures the newly stamped value is non-null and does not
      * float above a given guard.
      */
     public static Class<?> piCastNonNullClass(Class<?> type, GuardingNode guard) {
-        return intrinsified(type, guard, INTRINSIFY_OP_NON_NULL);
+        return intrinsified(type, guard, IntrinsifyOp.NON_NULL);
     }
 
     @NodeIntrinsic
-    private static native Class<?> intrinsified(Class<?> object, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
+    private static native Class<?> intrinsified(Class<?> object, GuardingNode guard, @ConstantNodeParameter IntrinsifyOp intrinsifyOp);
 
     /**
      * Changes the stamp of an object to represent a given type and to indicate that the object is