1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8026502: java/lang/invoke/MethodHandleConstants.java fails on all platforms

Browse Source 
Reviewed-by: iveresov, jrose
This commit is contained in:
Christian Thalinger 2013-10-24 10:52:15 -07:00
parent be2d6e6535
commit 1ac0200394
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/share/classes/java/lang/invoke/MethodHandles.java
View File

@ -1716,6 +1716,13 @@ return mh1;
checkSymbolicClass(defc); checkSymbolicClass(defc);
return mh; return mh;
} }
// Treat MethodHandle.invoke and invokeExact specially.
if (defc == MethodHandle.class && refKind == REF_invokeVirtual) {
mh = findVirtualForMH(member.getName(), member.getMethodType());
if (mh != null) {
return mh;
}
}
MemberName resolved = resolveOrFail(refKind, member); MemberName resolved = resolveOrFail(refKind, member);
mh = getDirectMethodForConstant(refKind, defc, resolved); mh = getDirectMethodForConstant(refKind, defc, resolved);
if (mh instanceof DirectMethodHandle if (mh instanceof DirectMethodHandle
@ -1768,12 +1775,6 @@ return mh1;
if (MethodHandleNatives.refKindIsField(refKind)) { if (MethodHandleNatives.refKindIsField(refKind)) {
return getDirectFieldNoSecurityManager(refKind, defc, member); return getDirectFieldNoSecurityManager(refKind, defc, member);
} else if (MethodHandleNatives.refKindIsMethod(refKind)) { } else if (MethodHandleNatives.refKindIsMethod(refKind)) {
if (defc == MethodHandle.class && refKind == REF_invokeVirtual) {
MethodHandle mh = findVirtualForMH(member.getName(), member.getMethodType());
if (mh != null) {
return mh;
}
}
return getDirectMethodNoSecurityManager(refKind, defc, member, lookupClass); return getDirectMethodNoSecurityManager(refKind, defc, member, lookupClass);
} else if (refKind == REF_newInvokeSpecial) { } else if (refKind == REF_newInvokeSpecial) {
return getDirectConstructorNoSecurityManager(defc, member); return getDirectConstructorNoSecurityManager(defc, member);