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

8280377: MethodHandleProxies does not correctly invoke default methods with varags

Browse source 
Reviewed-by: alanb
This commit is contained in:
Mandy Chung 2022-01-26 01:24:15 +00:00
parent 2eab86b513
commit a183bfb436
12 changed files with 295 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
View file

@ -28,9 +28,11 @@ package java.lang.invoke;
import java.lang.reflect.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
import jdk.internal.access.JavaLangReflectAccess;
import jdk.internal.access.SharedSecrets;
import sun.invoke.WrapperInstance;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
@ -184,8 +186,6 @@ public class MethodHandleProxies {
checkTarget = checkTarget.asType(checkTarget.type().changeReturnType(Object.class));
vaTargets[i] = checkTarget.asSpreader(Object[].class, smMT.parameterCount());
}
final ConcurrentHashMap<Method, MethodHandle> defaultMethodMap =
hasDefaultMethods(intfc) ? new ConcurrentHashMap<>() : null;
final InvocationHandler ih = new InvocationHandler() {
private Object getArg(String name) {
if ((Object)name == "getWrapperInstanceTarget") return target;
@ -202,7 +202,8 @@ public class MethodHandleProxies {
if (isObjectMethod(method))
return callObjectMethod(proxy, method, args);
if (isDefaultMethod(method)) {
return callDefaultMethod(defaultMethodMap, proxy, intfc, method, args);
// no additional access check is performed
return JLRA.invokeDefault(proxy, method, args, null);
}
throw newInternalError("bad proxy method: "+method);
}
@ -320,37 +321,5 @@ public class MethodHandleProxies {
return !Modifier.isAbstract(m.getModifiers());
}
private static boolean hasDefaultMethods(Class<?> intfc) {
for (Method m : intfc.getMethods()) {
if (!isObjectMethod(m) &&
!Modifier.isAbstract(m.getModifiers())) {
return true;
}
}
return false;
}
private static Object callDefaultMethod(ConcurrentHashMap<Method, MethodHandle> defaultMethodMap,
Object self, Class<?> intfc, Method m, Object[] args) throws Throwable {
assert(isDefaultMethod(m) && !isObjectMethod(m)) : m;
// Lazily compute the associated method handle from the method
MethodHandle dmh = defaultMethodMap.computeIfAbsent(m, mk -> {
try {
// Look up the default method for special invocation thereby
// avoiding recursive invocation back to the proxy
MethodHandle mh = MethodHandles.Lookup.IMPL_LOOKUP.findSpecial(
intfc, mk.getName(),
MethodType.methodType(mk.getReturnType(), mk.getParameterTypes()),
self.getClass());
return mh.asSpreader(Object[].class, mk.getParameterCount());
} catch (NoSuchMethodException | IllegalAccessException e) {
// The method is known to exist and should be accessible, this
// method would not be called unless the invokeinterface to the
// default (public) method passed access control checks
throw new InternalError(e);
}
});
return dmh.invoke(self, args);
}
private static final JavaLangReflectAccess JLRA = SharedSecrets.getJavaLangReflectAccess();
}