src/hotspot/share/classfile/systemDictionary.cpp

*** 2732,2778 ****
  
    // report back to the caller with the MethodType
    return method_type;
  }
  
  // Ask Java code to find or construct a method handle constant.
  Handle SystemDictionary::link_method_handle_constant(Klass* caller,
                                                       int ref_kind, //e.g., JVM_REF_invokeVirtual
                                                       Klass* callee,
!                                                      Symbol* name_sym,
                                                       Symbol* signature,
                                                       TRAPS) {
    Handle empty;
!   Handle name = java_lang_String::create_from_symbol(name_sym, CHECK_(empty));
!   Handle type;
!   if (signature->utf8_length() > 0 && signature->byte_at(0) == '(') {
!     type = find_method_handle_type(signature, caller, CHECK_(empty));
!   } else if (caller == NULL) {
!     // This should not happen.  JDK code should take care of that.
      THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad MH constant", empty);
-   } else {
-     ResourceMark rm(THREAD);
-     SignatureStream ss(signature, false);
-     if (!ss.is_done()) {
-       oop mirror = ss.as_java_mirror(Handle(THREAD, caller->class_loader()),
-                                      Handle(THREAD, caller->protection_domain()),
-                                      SignatureStream::NCDFError, CHECK_(empty));
-       type = Handle(THREAD, mirror);
-       ss.next();
-       if (!ss.is_done())  type = Handle();  // error!
-     }
-   }
-   if (type.is_null()) {
-     THROW_MSG_(vmSymbols::java_lang_LinkageError(), "bad signature", empty);
    }
  
    // call java.lang.invoke.MethodHandleNatives::linkMethodHandleConstant(Class caller, int refKind, Class callee, String name, Object type) -> MethodHandle
    JavaCallArguments args;
    args.push_oop(Handle(THREAD, caller->java_mirror()));  // the referring class
    args.push_int(ref_kind);
    args.push_oop(Handle(THREAD, callee->java_mirror()));  // the target class
!   args.push_oop(name);
    args.push_oop(type);
    JavaValue result(T_OBJECT);
    JavaCalls::call_static(&result,
                           SystemDictionary::MethodHandleNatives_klass(),
                           vmSymbols::linkMethodHandleConstant_name(),
--- 2732,2793 ----
  
    // report back to the caller with the MethodType
    return method_type;
  }
  
+ Handle SystemDictionary::find_field_handle_type(Symbol* signature,
+                                                 Klass* accessing_klass,
+                                                 TRAPS) {
+   Handle empty;
+   ResourceMark rm(THREAD);
+   SignatureStream ss(signature, /*is_method=*/ false);
+   if (!ss.is_done()) {
+     Handle class_loader, protection_domain;
+     if (accessing_klass != NULL) {
+       class_loader      = Handle(THREAD, accessing_klass->class_loader());
+       protection_domain = Handle(THREAD, accessing_klass->protection_domain());
+     }
+     oop mirror = ss.as_java_mirror(class_loader, protection_domain, SignatureStream::NCDFError, CHECK_(empty));
+     ss.next();
+     if (ss.is_done()) {
+       return Handle(THREAD, mirror);
+     }
+   }
+   return empty;
+ }
+ 
  // Ask Java code to find or construct a method handle constant.
  Handle SystemDictionary::link_method_handle_constant(Klass* caller,
                                                       int ref_kind, //e.g., JVM_REF_invokeVirtual
                                                       Klass* callee,
!                                                      Symbol* name,
                                                       Symbol* signature,
                                                       TRAPS) {
    Handle empty;
!   if (caller == NULL) {
      THROW_MSG_(vmSymbols::java_lang_InternalError(), "bad MH constant", empty);
    }
+   Handle name_str      = java_lang_String::create_from_symbol(name,      CHECK_(empty));
+   Handle signature_str = java_lang_String::create_from_symbol(signature, CHECK_(empty));
+ 
+   // Put symbolic info from the MH constant into freshly created MemberName and resolve it.
+   Handle mname = MemberName_klass()->allocate_instance_handle(CHECK_(empty));
+   java_lang_invoke_MemberName::set_clazz(mname(), callee->java_mirror());
+   java_lang_invoke_MemberName::set_name (mname(), name_str());
+   java_lang_invoke_MemberName::set_type (mname(), signature_str());
+   java_lang_invoke_MemberName::set_flags(mname(), MethodHandles::ref_kind_to_flags(ref_kind));
+   MethodHandles::resolve_MemberName(mname, caller, CHECK_(empty));
+ 
+   // After method/field resolution succeeded, it's safe to resolve MH signature as well.
+   Handle type = MethodHandles::resolve_MemberName_type(mname, caller, CHECK_(empty));
    
    // call java.lang.invoke.MethodHandleNatives::linkMethodHandleConstant(Class caller, int refKind, Class callee, String name, Object type) -> MethodHandle
    JavaCallArguments args;
    args.push_oop(Handle(THREAD, caller->java_mirror()));  // the referring class
    args.push_int(ref_kind);
    args.push_oop(Handle(THREAD, callee->java_mirror()));  // the target class
!   args.push_oop(name_str);
    args.push_oop(type);
    JavaValue result(T_OBJECT);
    JavaCalls::call_static(&result,
                           SystemDictionary::MethodHandleNatives_klass(),
                           vmSymbols::linkMethodHandleConstant_name(),