Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match RI behaviour for unrelfect with OpenJDK MHs in JDK8 #18552

Merged
merged 1 commit into from
Dec 5, 2023
Merged

Match RI behaviour for unrelfect with OpenJDK MHs in JDK8 #18552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
import java.lang.invoke.MethodHandleInfo;
/*[ENDIF] JAVA_SPEC_VERSION >= 16 */

/*[IF OPENJDK_METHODHANDLES & (JAVA_SPEC_VERSION < 9)]*/
import java.lang.reflect.Modifier;
import java.lang.reflect.Method;
/*[ENDIF] OPENJDK_METHODHANDLES & (JAVA_SPEC_VERSION < 9) */

/**
* Static methods for the MethodHandle class.
*/
Expand All @@ -62,6 +67,10 @@ final class MethodHandleResolver {
private static final int BSM_TYPE_ARGUMENT_INDEX = 2;
private static final int BSM_OPTIONAL_ARGUMENTS_START_INDEX = 3;

/*[IF OPENJDK_METHODHANDLES & (JAVA_SPEC_VERSION < 9)]*/
private static final int VARARGS = 0x80;
/*[ENDIF] OPENJDK_METHODHANDLES & (JAVA_SPEC_VERSION < 9) */

/*
* Return the result of J9_CP_TYPE(J9Class->romClass->cpShapeDescription, index)
*/
Expand Down Expand Up @@ -785,4 +794,51 @@ private static final Object upcallLinkCallerMethod(Class<?> callerClass, MethodT
/*[ENDIF] OPENJDK_METHODHANDLES*/
}
/*[ENDIF] JAVA_SPEC_VERSION >= 16 */

/*[IF OPENJDK_METHODHANDLES & (JAVA_SPEC_VERSION < 9)]*/
/**
* Create a MethodHandle to throw an AbstractMethodError if the error conditions
* are met. Used in MethodHandles.unreflect for OpenJDK MethodHandles to match
* the RI behaviour for JDK8 for private interface methods.
*
* @param m the Method whose modifiers determine if an AbstractMethodError
* thrower should be installed
*
* @return an AbstractMethodError-thrower MethodHandle or null
*
* @throws InternalError if the AbstractMethodError constructor cannot be found
*/
@SuppressWarnings("unused")
public static final MethodHandle maybeCreateAbstractMethodErrorThrower(Method m) {
MethodHandle result = null;
Class<?> declaringClass = m.getDeclaringClass();
int methodModifiers = m.getModifiers();

if (declaringClass.isInterface()
&& !Modifier.isStatic(methodModifiers)
&& Modifier.isPrivate(methodModifiers)
) {
MethodType type = MethodType.methodType(m.getReturnType(), m.getParameterTypes());
type = type.insertParameterTypes(0, declaringClass);

MethodHandle thrower = MethodHandles.throwException(type.returnType(), AbstractMethodError.class);
MethodHandle constructor;
try {
constructor = IMPL_LOOKUP.findConstructor(
AbstractMethodError.class,
MethodType.methodType(void.class));
} catch (IllegalAccessException | NoSuchMethodException e) {
throw new InternalError("Unable to find AbstractMethodError.<init>()"); //$NON-NLS-1$
}
result = MethodHandles.foldArguments(thrower, constructor);
result = MethodHandles.dropArguments(result, 0, type.parameterList());

if ((methodModifiers & VARARGS) != 0) {
Class<?> lastClass = result.type().lastParameterType();
result = result.asVarargsCollector(lastClass);
}
}
return result;
}
/*[ENDIF] OPENJDK_METHODHANDLES & (JAVA_SPEC_VERSION < 9) */
}