jdk-sandbox: comparison hotspot/src/share/vm/interpreter/linkResolver.cpp

equal deleted inserted replaced

-:b01a48301e67
+:8da0dc50a6e4
 assert(vtable_index >= 0 || vtable_index == Method::nonvirtual_vtable_index, "valid index");
 set_common(resolved_klass, selected_klass, resolved_method, selected_method, vtable_index, CHECK);
 assert(!resolved_method->is_compiled_lambda_form(), "these must be handled via an invokehandle call");
 }
-void CallInfo::set_handle(methodHandle resolved_method, Handle resolved_appendix, TRAPS) {
+void CallInfo::set_handle(methodHandle resolved_method, Handle resolved_appendix, Handle resolved_method_type, TRAPS) {
 if (resolved_method.is_null()) {
 THROW_MSG(vmSymbols::java_lang_InternalError(), "resolved method is null");
 }
 KlassHandle resolved_klass = SystemDictionary::MethodHandle_klass();
 assert(resolved_method->intrinsic_id() == vmIntrinsics::_invokeBasic ||
 resolved_method->is_compiled_lambda_form(),
 "linkMethod must return one of these");
 int vtable_index = Method::nonvirtual_vtable_index;
 assert(resolved_method->vtable_index() == vtable_index, "");
 set_common(resolved_klass, resolved_klass, resolved_method, resolved_method, vtable_index, CHECK);
-_resolved_appendix = resolved_appendix;
+_resolved_appendix    = resolved_appendix;
+_resolved_method_type = resolved_method_type;
 }
 void CallInfo::set_common(KlassHandle resolved_klass, KlassHandle selected_klass, methodHandle resolved_method, methodHandle selected_method, int vtable_index, TRAPS) {
 assert(resolved_method->signature() == selected_method->signature(), "signatures must correspond");
 _resolved_klass  = resolved_klass;
 }
 void LinkResolver::lookup_polymorphic_method(methodHandle& result,
 KlassHandle klass, Symbol* name, Symbol* full_signature,
 KlassHandle current_klass,
-Handle* appendix_result_or_null,
+Handle *appendix_result_or_null,
+Handle *method_type_result,
 TRAPS) {
 vmIntrinsics::ID iid = MethodHandles::signature_polymorphic_name_id(name);
 if (TraceMethodHandles) {
 tty->print_cr("lookup_polymorphic_method iid=%s %s.%s%s",
 vmIntrinsics::name_at(iid), klass->external_name(),
 CHECK);
 }
 }
 Handle appendix;
+Handle method_type;
 result = SystemDictionary::find_method_handle_invoker(name,
 full_signature,
 current_klass,
 &appendix,
+&method_type,
 CHECK);
 if (TraceMethodHandles) {
 tty->print("lookup_polymorphic_method => (via Java) ");
 result->print_on(tty);
 tty->print("  lookup_polymorphic_method => appendix = ");
 err_msg("%d != %d", actual_size_of_params, expected_size_of_params));
 #endif //ASSERT
 assert(appendix_result_or_null != NULL, "");
 (*appendix_result_or_null) = appendix;
+(*method_type_result)      = method_type;
 return;
 }
 }
 }
 }
 lookup_method_in_interfaces(resolved_method, resolved_klass, method_name, method_signature, CHECK);
 if (resolved_method.is_null()) {
 // JSR 292:  see if this is an implicitly generated method MethodHandle.linkToVirtual(*...), etc
 lookup_polymorphic_method(resolved_method, resolved_klass, method_name, method_signature,
-current_klass, (Handle*)NULL, THREAD);
+current_klass, (Handle*)NULL, (Handle*)NULL, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 nested_exception = Handle(THREAD, PENDING_EXCEPTION);
 CLEAR_PENDING_EXCEPTION;
 }
 }
 TRAPS) {
 // JSR 292:  this must be an implicitly generated method MethodHandle.invokeExact(*...) or similar
 assert(resolved_klass() == SystemDictionary::MethodHandle_klass(), "");
 assert(MethodHandles::is_signature_polymorphic_name(method_name), "");
 methodHandle resolved_method;
-Handle resolved_appendix;
+Handle       resolved_appendix;
+Handle       resolved_method_type;
 lookup_polymorphic_method(resolved_method, resolved_klass,
 method_name, method_signature,
-current_klass, &resolved_appendix, CHECK);
+current_klass, &resolved_appendix, &resolved_method_type, CHECK);
-result.set_handle(resolved_method, resolved_appendix, CHECK);
+result.set_handle(resolved_method, resolved_appendix, resolved_method_type, CHECK);
 }
 void LinkResolver::resolve_invokedynamic(CallInfo& result, constantPoolHandle pool, int index, TRAPS) {
 assert(EnableInvokeDynamic, "");
 pool->set_invokedynamic();    // mark header to flag active call sites
-//resolve_pool(<resolved_klass>, method_name,  method_signature, current_klass, pool, index, CHECK);
+//resolve_pool(<resolved_klass>, method_name, method_signature, current_klass, pool, index, CHECK);
 Symbol* method_name       = pool->name_ref_at(index);
 Symbol* method_signature  = pool->signature_ref_at(index);
 KlassHandle current_klass = KlassHandle(THREAD, pool->pool_holder());
 // Resolve the bootstrap specifier (BSM + optional arguments).
 assert(bsm_info != NULL, "");
 // FIXME: Cache this once per BootstrapMethods entry, not once per CONSTANT_InvokeDynamic.
 bootstrap_specifier = Handle(THREAD, bsm_info);
 }
 if (!cpce->is_f1_null()) {
-methodHandle method(THREAD, cpce->f1_as_method());
+methodHandle method(     THREAD, cpce->f1_as_method());
-Handle appendix(THREAD, cpce->appendix_if_resolved(pool));
+Handle       appendix(   THREAD, cpce->appendix_if_resolved(pool));
-result.set_handle(method, appendix, CHECK);
+Handle       method_type(THREAD, cpce->method_type_if_resolved(pool));
+result.set_handle(method, appendix, method_type, CHECK);
 return;
 }
 if (TraceMethodHandles) {
 tty->print_cr("resolve_invokedynamic #%d %s %s",
 KlassHandle current_klass,
 TRAPS) {
 // JSR 292:  this must resolve to an implicitly generated method MH.linkToCallSite(*...)
 // The appendix argument is likely to be a freshly-created CallSite.
 Handle       resolved_appendix;
+Handle       resolved_method_type;
 methodHandle resolved_method =
 SystemDictionary::find_dynamic_call_site_invoker(current_klass,
 bootstrap_specifier,
 method_name, method_signature,
 &resolved_appendix,
+&resolved_method_type,
 THREAD);
 if (HAS_PENDING_EXCEPTION) {
 if (TraceMethodHandles) {
 tty->print_cr("invokedynamic throws BSME for "INTPTR_FORMAT, PENDING_EXCEPTION);
 PENDING_EXCEPTION->print();
 // See the "Linking Exceptions" section for the invokedynamic instruction in the JVMS.
 Handle nested_exception(THREAD, PENDING_EXCEPTION);
 CLEAR_PENDING_EXCEPTION;
 THROW_CAUSE(vmSymbols::java_lang_BootstrapMethodError(), nested_exception)
 }
-result.set_handle(resolved_method, resolved_appendix, CHECK);
+result.set_handle(resolved_method, resolved_appendix, resolved_method_type, CHECK);
 }
 //------------------------------------------------------------------------------------------------------------------------
 #ifndef PRODUCT

changeset 13929	8da0dc50a6e4
parent 13732	a9865f5514fc
child 15918	3fcc894aca8c
child 14385	959bbcc16725