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

8263380: Unintended use of Objects.nonNull in VarHandles

Browse source 
Reviewed-by: rriggs
This commit is contained in:
Claes Redestad 2021-03-10 17:03:39 +00:00
parent 4b5be40ab9
commit 7e52a6e8b3
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/java.base/share/classes/java/lang/invoke/VarHandles.java
View file

@ -360,9 +360,9 @@ final class VarHandles {
}
public static VarHandle filterValue(VarHandle target, MethodHandle filterToTarget, MethodHandle filterFromTarget) {
Objects.nonNull(target);
Objects.nonNull(filterToTarget);
Objects.nonNull(filterFromTarget);
Objects.requireNonNull(target);
Objects.requireNonNull(filterToTarget);
Objects.requireNonNull(filterFromTarget);
//check that from/to filters do not throw checked exceptions
noCheckedExceptions(filterToTarget);
noCheckedExceptions(filterFromTarget);
@ -459,8 +459,8 @@ final class VarHandles {
}
public static VarHandle filterCoordinates(VarHandle target, int pos, MethodHandle... filters) {
Objects.nonNull(target);
Objects.nonNull(filters);
Objects.requireNonNull(target);
Objects.requireNonNull(filters);
List<Class<?>> targetCoordinates = target.coordinateTypes();
if (pos < 0 || pos >= targetCoordinates.size()) {
@ -488,8 +488,8 @@ final class VarHandles {
}
public static VarHandle insertCoordinates(VarHandle target, int pos, Object... values) {
Objects.nonNull(target);
Objects.nonNull(values);
Objects.requireNonNull(target);
Objects.requireNonNull(values);
List<Class<?>> targetCoordinates = target.coordinateTypes();
if (pos < 0 || pos >= targetCoordinates.size()) {
@ -517,9 +517,9 @@ final class VarHandles {
}
public static VarHandle permuteCoordinates(VarHandle target, List<Class<?>> newCoordinates, int... reorder) {
Objects.nonNull(target);
Objects.nonNull(newCoordinates);
Objects.nonNull(reorder);
Objects.requireNonNull(target);
Objects.requireNonNull(newCoordinates);
Objects.requireNonNull(reorder);
List<Class<?>> targetCoordinates = target.coordinateTypes();
MethodHandles.permuteArgumentChecks(reorder,
@ -565,8 +565,8 @@ final class VarHandles {
}
public static VarHandle collectCoordinates(VarHandle target, int pos, MethodHandle filter) {
Objects.nonNull(target);
Objects.nonNull(filter);
Objects.requireNonNull(target);
Objects.requireNonNull(filter);
noCheckedExceptions(filter);
List<Class<?>> targetCoordinates = target.coordinateTypes();
@ -587,8 +587,8 @@ final class VarHandles {
}
public static VarHandle dropCoordinates(VarHandle target, int pos, Class<?>... valueTypes) {
Objects.nonNull(target);
Objects.nonNull(valueTypes);
Objects.requireNonNull(target);
Objects.requireNonNull(valueTypes);
List<Class<?>> targetCoordinates = target.coordinateTypes();
if (pos < 0 || pos > targetCoordinates.size()) {