infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-27 02:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

8143142: AssertionError in MethodHandleImpl

Browse Source 
Reviewed-by: psandoz, vlivanov
This commit is contained in:
Claes Redestad 2015-11-17 15:29:21 +01:00
parent ff9d178e96
commit 42e4e0c06f
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
View File

@ -781,7 +781,7 @@ class InvokerBytecodeGenerator {
static boolean isStaticallyInvocable(NamedFunction[] functions) {
for (NamedFunction nf : functions) {
if (!isStaticallyInvocable(nf.member)) {
if (!isStaticallyInvocable(nf.member())) {
return false;
}
}

22
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
View File

@ -1605,19 +1605,15 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
static {
try {
NamedFunction nfs[] = {
NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("checkSpreadArgument", Object.class, int.class)),
NF_guardWithCatch = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("guardWithCatch", MethodHandle.class, Class.class,
MethodHandle.class, Object[].class)),
NF_throwException = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("throwException", Throwable.class)),
NF_profileBoolean = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("profileBoolean", boolean.class, int[].class))
};
// Each nf must be statically invocable or we get tied up in our bootstraps.
assert(InvokerBytecodeGenerator.isStaticallyInvocable(nfs));
NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("checkSpreadArgument", Object.class, int.class));
NF_guardWithCatch = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("guardWithCatch", MethodHandle.class, Class.class,
MethodHandle.class, Object[].class));
NF_throwException = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("throwException", Throwable.class));
NF_profileBoolean = new NamedFunction(MethodHandleImpl.class
.getDeclaredMethod("profileBoolean", boolean.class, int[].class));
} catch (ReflectiveOperationException ex) {
throw newInternalError(ex);
}