8138732: Rename @HotSpotIntrinsicCandidate to @IntrinsicCandidate and move it to the jdk.internal.vm.annotation package

Reviewed-by: dholmes, alanb, psandoz, kvn, egahlin

src/java.base/share/classes/java/lang/invoke/MethodHandle.java

@@ -26,7 +26,7 @@
 package java.lang.invoke;
 
 
-import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 import java.lang.constant.ClassDesc;
 import java.lang.constant.Constable;
@@ -499,7 +499,7 @@ public abstract class MethodHandle implements Constable {
      * @throws WrongMethodTypeException if the target's type is not identical with the caller's symbolic type descriptor
      * @throws Throwable anything thrown by the underlying method propagates unchanged through the method handle call
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     public final native @PolymorphicSignature Object invokeExact(Object... args) throws Throwable;
 
     /**
@@ -537,7 +537,7 @@ public abstract class MethodHandle implements Constable {
      * @throws ClassCastException if the target's type can be adjusted to the caller, but a reference cast fails
      * @throws Throwable anything thrown by the underlying method propagates unchanged through the method handle call
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     public final native @PolymorphicSignature Object invoke(Object... args) throws Throwable;
 
     /**
@@ -557,7 +557,7 @@ public abstract class MethodHandle implements Constable {
      * @param args the signature-polymorphic parameter list, statically represented using varargs
      * @return the signature-polymorphic result, statically represented using {@code Object}
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     /*non-public*/
     final native @PolymorphicSignature Object invokeBasic(Object... args) throws Throwable;
 
@@ -568,7 +568,7 @@ public abstract class MethodHandle implements Constable {
      * @param args the signature-polymorphic parameter list, statically represented using varargs
      * @return the signature-polymorphic result, statically represented using {@code Object}
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     /*non-public*/
     static native @PolymorphicSignature Object linkToVirtual(Object... args) throws Throwable;
 
@@ -579,7 +579,7 @@ public abstract class MethodHandle implements Constable {
      * @param args the signature-polymorphic parameter list, statically represented using varargs
      * @return the signature-polymorphic result, statically represented using {@code Object}
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     /*non-public*/
     static native @PolymorphicSignature Object linkToStatic(Object... args) throws Throwable;
 
@@ -590,7 +590,7 @@ public abstract class MethodHandle implements Constable {
      * @param args the signature-polymorphic parameter list, statically represented using varargs
      * @return the signature-polymorphic result, statically represented using {@code Object}
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     /*non-public*/
     static native @PolymorphicSignature Object linkToSpecial(Object... args) throws Throwable;
 
@@ -601,7 +601,7 @@ public abstract class MethodHandle implements Constable {
      * @param args the signature-polymorphic parameter list, statically represented using varargs
      * @return the signature-polymorphic result, statically represented using {@code Object}
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     /*non-public*/
     static native @PolymorphicSignature Object linkToInterface(Object... args) throws Throwable;
 

src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -695,7 +695,7 @@ abstract class MethodHandleImpl {
 
     // Intrinsified by C2. Counters are used during parsing to calculate branch frequencies.
     @Hidden
-    @jdk.internal.HotSpotIntrinsicCandidate
+    @jdk.internal.vm.annotation.IntrinsicCandidate
     static boolean profileBoolean(boolean result, int[] counters) {
         // Profile is int[2] where [0] and [1] correspond to false and true occurrences respectively.
         int idx = result ? 1 : 0;
@@ -710,7 +710,7 @@ abstract class MethodHandleImpl {
 
     // Intrinsified by C2. Returns true if obj is a compile-time constant.
     @Hidden
-    @jdk.internal.HotSpotIntrinsicCandidate
+    @jdk.internal.vm.annotation.IntrinsicCandidate
     static boolean isCompileConstant(Object obj) {
         return false;
     }

src/java.base/share/classes/java/lang/invoke/VarHandle.java

@@ -39,9 +39,9 @@ import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import jdk.internal.HotSpotIntrinsicCandidate;
 import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
 
 import static java.lang.invoke.MethodHandleStatics.UNSAFE;
@@ -494,7 +494,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object get(Object... args);
 
     /**
@@ -520,7 +520,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     void set(Object... args);
 
 
@@ -552,7 +552,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getVolatile(Object... args);
 
     /**
@@ -582,7 +582,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     void setVolatile(Object... args);
 
 
@@ -612,7 +612,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getOpaque(Object... args);
 
     /**
@@ -639,7 +639,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     void setOpaque(Object... args);
 
 
@@ -676,7 +676,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAcquire(Object... args);
 
     /**
@@ -707,7 +707,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     void setRelease(Object... args);
 
 
@@ -743,7 +743,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     boolean compareAndSet(Object... args);
 
     /**
@@ -778,7 +778,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object compareAndExchange(Object... args);
 
     /**
@@ -813,7 +813,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object compareAndExchangeAcquire(Object... args);
 
     /**
@@ -848,7 +848,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object compareAndExchangeRelease(Object... args);
 
     // Weak (spurious failures allowed)
@@ -887,7 +887,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     boolean weakCompareAndSetPlain(Object... args);
 
     /**
@@ -924,7 +924,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     boolean weakCompareAndSet(Object... args);
 
     /**
@@ -962,7 +962,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     boolean weakCompareAndSetAcquire(Object... args);
 
     /**
@@ -1000,7 +1000,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     boolean weakCompareAndSetRelease(Object... args);
 
     /**
@@ -1033,7 +1033,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndSet(Object... args);
 
     /**
@@ -1066,7 +1066,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndSetAcquire(Object... args);
 
     /**
@@ -1099,7 +1099,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndSetRelease(Object... args);
 
     // Primitive adders
@@ -1135,7 +1135,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndAdd(Object... args);
 
     /**
@@ -1168,7 +1168,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndAddAcquire(Object... args);
 
     /**
@@ -1201,7 +1201,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndAddRelease(Object... args);
 
 
@@ -1242,7 +1242,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseOr(Object... args);
 
     /**
@@ -1279,7 +1279,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseOrAcquire(Object... args);
 
     /**
@@ -1316,7 +1316,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseOrRelease(Object... args);
 
     /**
@@ -1353,7 +1353,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseAnd(Object... args);
 
     /**
@@ -1390,7 +1390,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseAndAcquire(Object... args);
 
     /**
@@ -1427,7 +1427,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseAndRelease(Object... args);
 
     /**
@@ -1464,7 +1464,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseXor(Object... args);
 
     /**
@@ -1501,7 +1501,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseXorAcquire(Object... args);
 
     /**
@@ -1538,7 +1538,7 @@ public abstract class VarHandle implements Constable {
      */
     public final native
     @MethodHandle.PolymorphicSignature
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     Object getAndBitwiseXorRelease(Object... args);