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/com/sun/crypto/provider/AESCrypt.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -40,7 +40,7 @@ import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.util.Arrays;
 
-import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 /**
  * Rijndael --pronounced Reindaal-- is a symmetric cipher with a 128-bit
@@ -356,7 +356,7 @@ final class AESCrypt extends SymmetricCipher implements AESConstants
     }
 
     // Encryption operation. Possibly replaced with a compiler intrinsic.
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private void implEncryptBlock(byte[] in, int inOffset,
                                   byte[] out, int outOffset)
     {
@@ -435,7 +435,7 @@ final class AESCrypt extends SymmetricCipher implements AESConstants
     }
 
     // Decrypt operation. Possibly replaced with a compiler intrinsic.
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private void implDecryptBlock(byte[] in, int inOffset,
                                   byte[] out, int outOffset)
     {

src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,7 +29,7 @@ import java.security.InvalidKeyException;
 import java.security.ProviderException;
 import java.util.Objects;
 
-import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 import sun.security.util.ArrayUtil;
 
 
@@ -153,7 +153,7 @@ class CipherBlockChaining extends FeedbackCipher  {
                            cipher, cipherOffset);
     }
 
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private int implEncrypt(byte[] plain, int plainOffset, int plainLen,
                             byte[] cipher, int cipherOffset)
     {
@@ -203,7 +203,7 @@ class CipherBlockChaining extends FeedbackCipher  {
         return implDecrypt(cipher, cipherOffset, cipherLen, plain, plainOffset);
     }
 
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private int implDecrypt(byte[] cipher, int cipherOffset, int cipherLen,
                             byte[] plain, int plainOffset)
     {

src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -27,7 +27,7 @@ package com.sun.crypto.provider;
 
 import java.security.InvalidKeyException;
 
-import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 import sun.security.util.ArrayUtil;
 
 /**
@@ -182,7 +182,7 @@ class CounterMode extends FeedbackCipher {
     }
 
     // Implementation of crpyt() method. Possibly replaced with a compiler intrinsic.
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private int implCrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
         int result = len;
         while (len-- > 0) {

src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,7 +29,7 @@ import java.security.InvalidKeyException;
 import java.security.ProviderException;
 import sun.security.util.ArrayUtil;
 import java.util.Objects;
-import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 /**
  * This class represents ciphers in electronic codebook (ECB) mode.
@@ -97,7 +97,7 @@ final class ElectronicCodeBook extends FeedbackCipher {
         embeddedCipher.init(decrypting, algorithm, key);
     }
 
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private int implECBEncrypt(byte [] in, int inOff, int len, byte[] out, int outOff) {
         for (int i = len; i >= blockSize; i -= blockSize) {
             embeddedCipher.encryptBlock(in, inOff, out, outOff);
@@ -131,7 +131,7 @@ final class ElectronicCodeBook extends FeedbackCipher {
         return implECBEncrypt(in, inOff, len, out, outOff);
     }
 
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private int implECBDecrypt(byte [] in, int inOff, int len, byte[] out, int outOff) {
         for (int i = len; i >= blockSize; i -= blockSize) {
             embeddedCipher.decryptBlock(in, inOff, out, outOff);

src/java.base/share/classes/com/sun/crypto/provider/GHASH.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -31,7 +31,7 @@ package com.sun.crypto.provider;
 
 import java.security.ProviderException;
 
-import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 /**
  * This class represents the GHASH function defined in NIST 800-38D
@@ -229,7 +229,7 @@ final class GHASH {
      * the hotspot signature.  This method and methods called by it, cannot
      * throw exceptions or allocate arrays as it will breaking intrinsics
      */
-    @HotSpotIntrinsicCandidate
+    @IntrinsicCandidate
     private static void processBlocks(byte[] data, int inOfs, int blocks, long[] st, long[] subH) {
         int offset = inOfs;
         while (blocks > 0) {