archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/util/Arrays.java
View file

@ -25,8 +25,8 @@
package java.util;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.util.ArraysSupport;
import jdk.internal.vm.annotation.IntrinsicCandidate;
import java.io.Serializable;
import java.lang.reflect.Array;
@ -2577,7 +2577,7 @@ public class Arrays {
* @param a2 the other array to be tested for equality
* @return {@code true} if the two arrays are equal
*/
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
public static boolean equals(char[] a, char[] a2) {
if (a==a2)
return true;
@ -2650,7 +2650,7 @@ public class Arrays {
* @param a2 the other array to be tested for equality
* @return {@code true} if the two arrays are equal
*/
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
public static boolean equals(byte[] a, byte[] a2) {
if (a==a2)
return true;
@ -3504,7 +3504,7 @@ public class Arrays {
* an array of class {@code newType}
* @since 1.6
*/
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
public static <T,U> T[] copyOf(U[] original, int newLength, Class<? extends T[]> newType) {
@SuppressWarnings("unchecked")
T[] copy = ((Object)newType == (Object)Object[].class)
@ -3774,7 +3774,7 @@ public class Arrays {
* an array of class {@code newType}.
* @since 1.6
*/
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
public static <T,U> T[] copyOfRange(U[] original, int from, int to, Class<? extends T[]> newType) {
int newLength = to - from;
if (newLength < 0)

4
src/java.base/share/classes/java/util/Base64.java
View file

@ -33,7 +33,7 @@ import java.nio.ByteBuffer;
import sun.nio.cs.ISO_8859_1;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.vm.annotation.IntrinsicCandidate;
/**
* This class consists exclusively of static methods for obtaining
@ -418,7 +418,7 @@ public class Base64 {
return new Encoder(isURL, newline, linemax, false);
}
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
private void encodeBlock(byte[] src, int sp, int sl, byte[] dst, int dp, boolean isURL) {
char[] base64 = isURL ? toBase64URL : toBase64;
for (int sp0 = sp, dp0 = dp ; sp0 < sl; ) {

6
src/java.base/share/classes/java/util/stream/Streams.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
@ -31,7 +31,7 @@ import java.util.function.Consumer;
import java.util.function.DoubleConsumer;
import java.util.function.IntConsumer;
import java.util.function.LongConsumer;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.vm.annotation.IntrinsicCandidate;
/**
* Utility methods for operating on and creating streams.
@ -91,7 +91,7 @@ final class Streams {
}
@Override
@HotSpotIntrinsicCandidate
@IntrinsicCandidate
public void forEachRemaining(IntConsumer consumer) {
Objects.requireNonNull(consumer);

8
src/java.base/share/classes/java/util/zip/Adler32.java
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);

10
src/java.base/share/classes/java/util/zip/CRC32.java
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);

8
src/java.base/share/classes/java/util/zip/CRC32C.java
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) {