Skip to content
Snippets Groups Projects
Commit 7e52a6e8 authored by Claes Redestad's avatar Claes Redestad
Browse files

8263380: Unintended use of Objects.nonNull in VarHandles

Reviewed-by: rriggs
parent 4b5be40a
No related branches found
No related tags found
No related merge requests found
......@@ -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()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment