openjdk/jdk7u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk7u.git synced 2025-12-10 10:13:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

8281866: Enhance MethodHandle invocations

Browse Source 
Reviewed-by: yan
Backport-of: d974d9da365f787f67971d88c79371c8b0769f75
This commit is contained in:
Alexey Pavlyutkin 2022-06-02 11:41:21 +03:00 committed by Andrew Brygin
parent 4948c77163
commit ba2836db76
4 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hotspot/src/share/vm/interpreter/linkResolver.cpp
View File

@ -1209,12 +1209,12 @@ void LinkResolver::resolve_invokehandle(CallInfo& result, constantPoolHandle poo
ResourceMark rm(THREAD);
tty->print_cr("resolve_invokehandle %s %s", method_name->as_C_string(), method_signature->as_C_string());
}
resolve_handle_call(result, resolved_klass, method_name, method_signature, current_klass, CHECK);
resolve_handle_call(result, resolved_klass, method_name, method_signature, current_klass, true, CHECK);
}
void LinkResolver::resolve_handle_call(CallInfo& result, KlassHandle resolved_klass,
Symbol* method_name, Symbol* method_signature,
KlassHandle current_klass,
KlassHandle current_klass, bool check_access,
TRAPS) {
// JSR 292: this must be an implicitly generated method MethodHandle.invokeExact(*...) or similar
assert(resolved_klass() == SystemDictionary::MethodHandle_klass(), "");
@ -1225,6 +1225,25 @@ void LinkResolver::resolve_handle_call(CallInfo& result, KlassHandle resolved_kl
lookup_polymorphic_method(resolved_method, resolved_klass,
method_name, method_signature,
current_klass, &resolved_appendix, &resolved_method_type, CHECK);
if (check_access) {
vmIntrinsics::ID iid = MethodHandles::signature_polymorphic_name_id(method_name);
if (MethodHandles::is_signature_polymorphic_intrinsic(iid)) {
// Check if method can be accessed by the referring class.
// MH.linkTo* invocations are not rewritten to invokehandle.
assert(iid == vmIntrinsics::_invokeBasic, err_msg("%s", vmIntrinsics::name_at(iid)));
assert(current_klass.not_null(), "current_klass should not be null");
check_method_accessability(current_klass,
resolved_klass,
resolved_method->method_holder(),
resolved_method,
CHECK);
} else {
// Java code is free to arbitrarily link signature-polymorphic invokers.
assert(iid == vmIntrinsics::_invokeGeneric, err_msg("not an invoker: %s", vmIntrinsics::name_at(iid)));
assert(MethodHandles::is_signature_polymorphic_public_name(resolved_klass(), method_name), "not public");
}
}
result.set_handle(resolved_method, resolved_appendix, resolved_method_type, CHECK);
}

2
hotspot/src/share/vm/interpreter/linkResolver.hpp
View File

@ -162,7 +162,7 @@ class LinkResolver: AllStatic {
static void resolve_special_call (CallInfo& result, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
static void resolve_virtual_call (CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool check_null_and_abstract, TRAPS);
static void resolve_interface_call(CallInfo& result, Handle recv, KlassHandle recv_klass, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, bool check_null_and_abstract, TRAPS);
static void resolve_handle_call (CallInfo& result, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, TRAPS);
static void resolve_handle_call (CallInfo& result, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
static void resolve_dynamic_call (CallInfo& result, Handle bootstrap_specifier, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, TRAPS);
// same as above for compile-time resolution; but returns null handle instead of throwing an exception on error

20
hotspot/src/share/vm/prims/methodHandles.cpp
View File

@ -413,6 +413,24 @@ vmIntrinsics::ID MethodHandles::signature_polymorphic_name_id(klassOop klass, Sy
return vmIntrinsics::_none;
}
// Returns true if method is signature polymorphic and public
bool MethodHandles::is_signature_polymorphic_public_name(klassOop klass, Symbol* name) {
if (is_signature_polymorphic_name(klass, name)) {
instanceKlass* iklass = instanceKlass::cast(klass);
int me;
int ms = iklass->find_method_by_name(name, &me);
assert(ms != -1, "");
for (; ms < me; ms++) {
methodOop m = methodOop(iklass->methods()->obj_at(ms));
int required = JVM_ACC_NATIVE | JVM_ACC_VARARGS | JVM_ACC_PUBLIC;
int flags = m->access_flags().as_int();
if ((flags & required) == required && ArgumentCount(m->signature()).size() == 1) {
return true;
}
}
}
return false;
}
// convert the external string or reflective type to an internal signature
Symbol* MethodHandles::lookup_signature(oop type_str, bool intern_if_not_found, TRAPS) {
@ -697,7 +715,7 @@ Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS
} else if (mh_invoke_id != vmIntrinsics::_none) {
assert(!is_signature_polymorphic_static(mh_invoke_id), "");
LinkResolver::resolve_handle_call(result,
defc, name, type, caller, THREAD);
defc, name, type, caller, caller.not_null(), THREAD);
} else if (ref_kind == JVM_REF_invokeSpecial) {
do_dispatch = false; // force non-virtual linkage
LinkResolver::resolve_special_call(result,

1
hotspot/src/share/vm/prims/methodHandles.hpp
View File

@ -129,6 +129,7 @@ class MethodHandles: AllStatic {
static bool is_signature_polymorphic_name(klassOop klass, Symbol* name) {
return signature_polymorphic_name_id(klass, name) != vmIntrinsics::_none;
}
static bool is_signature_polymorphic_public_name(klassOop klass, Symbol* name);
enum {
// format of query to getConstant: