archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8150436: Incorrect invocation mode when linkToInteface linker is eliminated

Browse source 
Reviewed-by: kvn, shade
This commit is contained in:
Vladimir Ivanov 2016-02-26 01:58:29 +03:00
parent abebc2da5c
commit a7d78599d7
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View file

@ -1134,13 +1134,20 @@ Handle SharedRuntime::find_callee_info_helper(JavaThread* thread,
MethodHandles::is_signature_polymorphic_intrinsic(id)) {
bc = MethodHandles::signature_polymorphic_intrinsic_bytecode(id);
// Need to adjust invokehandle since inlining through signature-polymorphic
// method happened.
if (bc == Bytecodes::_invokehandle &&
!MethodHandles::is_signature_polymorphic_method(attached_method())) {
// Adjust invocation mode according to the attached method.
switch (bc) {
case Bytecodes::_invokeinterface:
if (!attached_method->method_holder()->is_interface()) {
bc = Bytecodes::_invokevirtual;
}
break;
case Bytecodes::_invokehandle:
if (!MethodHandles::is_signature_polymorphic_method(attached_method())) {
bc = attached_method->is_static() ? Bytecodes::_invokestatic
: Bytecodes::_invokevirtual;
}
break;
}
}
} else {
bc = bytecode.invoke_code();

5
hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java
View file

@ -180,7 +180,10 @@ public class InvokeTest {
static void testInterface() {
System.out.println("linkToInterface");
// Monomorphic case (optimized virtual call)
// Monomorphic case (optimized virtual call), concrete target method
run(() -> linkToInterface(new P1(), P1.class));
// Monomorphic case (optimized virtual call), default target method
run(() -> linkToInterface(new T(), I.class));
// Megamorphic case (virtual call)