archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8223437: Backout JDK-8219974 Restore static callsite resolution for the current class

Browse source 
Reviewed-by: jwilhelm, vlivanov
This commit is contained in:
David Holmes 2019-05-07 17:33:19 -04:00
parent 9e2784b24f
commit b0d52bcca1
4 changed files with 23 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/hotspot/share/interpreter/interpreterRuntime.cpp
View file

@ -920,23 +920,19 @@ void InterpreterRuntime::resolve_invoke(JavaThread* thread, Bytecodes::Code byte
info.call_kind() == CallInfo::vtable_call, "");
}
#endif
// Get sender or sender's unsafe_anonymous_host, and only set cpCache entry to resolved if
// it is not an interface. The receiver for invokespecial calls within interface
// methods must be checked for every call.
InstanceKlass* sender = pool->pool_holder();
sender = sender->is_unsafe_anonymous() ? sender->unsafe_anonymous_host() : sender;
switch (info.call_kind()) {
case CallInfo::direct_call: {
// Get sender or sender's unsafe_anonymous_host, and only set cpCache entry to resolved if
// it is not an interface. The receiver for invokespecial calls within interface
// methods must be checked for every call.
InstanceKlass* pool_holder = pool->pool_holder();
InstanceKlass* sender = pool_holder->is_unsafe_anonymous() ?
pool_holder->unsafe_anonymous_host() : pool_holder;
case CallInfo::direct_call:
cp_cache_entry->set_direct_call(
bytecode,
info.resolved_method(),
sender->is_interface(),
pool_holder);
sender->is_interface());
break;
}
case CallInfo::vtable_call:
cp_cache_entry->set_vtable_call(
bytecode,