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

Reviewed-by: dholmes, alanb, psandoz, kvn, egahlin
This commit is contained in:
Philippe Marschall 2020-09-30 20:05:07 +00:00 committed by Vladimir Kozlov
parent 4b16f8ab94
commit 2a406f3ce5
64 changed files with 488 additions and 488 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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
@ -28,7 +28,7 @@ package java.util.zip;
import java.nio.ByteBuffer;
import sun.nio.ch.DirectBuffer;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.vm.annotation.IntrinsicCandidate;
/**
* A class that can be used to compute the Adler-32 checksum of a data
@ -129,10 +129,10 @@ public class Adler32 implements Checksum {
private static native int update(int adler, int b);
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private static native int updateBytes(int adler, byte[] b, int off,
int len);
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private static native int updateByteBuffer(int adler, long addr,
int off, int len);

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 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.nio.ByteBuffer;
import java.util.Objects;
import sun.nio.ch.DirectBuffer;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.vm.annotation.IntrinsicCandidate;
/**
* A class that can be used to compute the CRC-32 of a data stream.
@ -126,7 +126,7 @@ public class CRC32 implements Checksum {
return (long)crc & 0xffffffffL;
}
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private static native int update(int crc, int b);
private static int updateBytes(int crc, byte[] b, int off, int len) {
@ -134,7 +134,7 @@ public class CRC32 implements Checksum {
return updateBytes0(crc, b, off, len);
}
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private static native int updateBytes0(int crc, byte[] b, int off, int len);
private static void updateBytesCheck(byte[] b, int off, int len) {
@ -160,7 +160,7 @@ public class CRC32 implements Checksum {
return updateByteBuffer0(alder, addr, off, len);
}
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private static native int updateByteBuffer0(int alder, long addr,
int off, int len);

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 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,8 +27,8 @@ package java.util.zip;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.Unsafe;
import jdk.internal.vm.annotation.IntrinsicCandidate;
import sun.nio.ch.DirectBuffer;
/**
@ -206,7 +206,7 @@ public final class CRC32C implements Checksum {
/**
* Updates the CRC-32C checksum with the specified array of bytes.
*/
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private static int updateBytes(int crc, byte[] b, int off, int end) {
// Do only byte reads for arrays so short they can't be aligned
@ -281,7 +281,7 @@ public final class CRC32C implements Checksum {
/**
* Updates the CRC-32C checksum reading from the specified address.
*/
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private static int updateDirectByteBuffer(int crc, long address,
int off, int end) {