src/hotspot/share/prims/methodHandles.cpp

rev 49420 : 8200238: Reduce number of exceptions created when calling MemberName$Factory::resolveOrNull
Reviewed-by: lfoltan, acorn

*** 302,312 ****
      flags |= CALLER_SENSITIVE;
    }
  
    Handle resolved_method = info.resolved_method_name();
    assert(java_lang_invoke_ResolvedMethodName::vmtarget(resolved_method()) == m(),
!          "Should not change after link resolultion");
  
    oop mname_oop = mname();
    java_lang_invoke_MemberName::set_flags  (mname_oop, flags);
    java_lang_invoke_MemberName::set_method (mname_oop, resolved_method());
    java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex);   // vtable/itable index
--- 302,312 ----
      flags |= CALLER_SENSITIVE;
    }
  
    Handle resolved_method = info.resolved_method_name();
    assert(java_lang_invoke_ResolvedMethodName::vmtarget(resolved_method()) == m(),
!          "Should not change after link resolution");
  
    oop mname_oop = mname();
    java_lang_invoke_MemberName::set_flags  (mname_oop, flags);
    java_lang_invoke_MemberName::set_method (mname_oop, resolved_method());
    java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex);   // vtable/itable index
*** 1183,1193 ****
    MethodHandles::expand_MemberName(mname, 0, CHECK);
  }
  JVM_END
  
  // void resolve(MemberName self, Class<?> caller)
! JVM_ENTRY(jobject, MHN_resolve_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jclass caller_jh)) {
    if (mname_jh == NULL) { THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "mname is null"); }
    Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
  
    // The trusted Java code that calls this method should already have performed
    // access checks on behalf of the given caller.  But, we can verify this.
--- 1183,1194 ----
    MethodHandles::expand_MemberName(mname, 0, CHECK);
  }
  JVM_END
  
  // void resolve(MemberName self, Class<?> caller)
! JVM_ENTRY(jobject, MHN_resolve_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jclass caller_jh,
!     jboolean speculative_resolve)) {
    if (mname_jh == NULL) { THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "mname is null"); }
    Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
  
    // The trusted Java code that calls this method should already have performed
    // access checks on behalf of the given caller.  But, we can verify this.
*** 1219,1228 ****
--- 1220,1232 ----
      int flags = java_lang_invoke_MemberName::flags(mname());
      int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
      if (!MethodHandles::ref_kind_is_valid(ref_kind)) {
        THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "obsolete MemberName format");
      }
+     if (speculative_resolve) {
+       return NULL;
+     }
      if ((flags & ALL_KINDS) == IS_FIELD) {
        THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), "field resolution failed");
      } else if ((flags & ALL_KINDS) == IS_METHOD ||
                 (flags & ALL_KINDS) == IS_CONSTRUCTOR) {
        THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), "method resolution failed");
*** 1510,1520 ****
  
  // These are the native methods on java.lang.invoke.MethodHandleNatives.
  static JNINativeMethod MHN_methods[] = {
    {CC "init",                      CC "(" MEM "" OBJ ")V",                   FN_PTR(MHN_init_Mem)},
    {CC "expand",                    CC "(" MEM ")V",                          FN_PTR(MHN_expand_Mem)},
!   {CC "resolve",                   CC "(" MEM "" CLS ")" MEM,                FN_PTR(MHN_resolve_Mem)},
    //  static native int getNamedCon(int which, Object[] name)
    {CC "getNamedCon",               CC "(I[" OBJ ")I",                        FN_PTR(MHN_getNamedCon)},
    //  static native int getMembers(Class<?> defc, String matchName, String matchSig,
    //          int matchFlags, Class<?> caller, int skip, MemberName[] results);
    {CC "getMembers",                CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)},
--- 1514,1524 ----
  
  // These are the native methods on java.lang.invoke.MethodHandleNatives.
  static JNINativeMethod MHN_methods[] = {
    {CC "init",                      CC "(" MEM "" OBJ ")V",                   FN_PTR(MHN_init_Mem)},
    {CC "expand",                    CC "(" MEM ")V",                          FN_PTR(MHN_expand_Mem)},
!   {CC "resolve",                   CC "(" MEM "" CLS "Z)" MEM,               FN_PTR(MHN_resolve_Mem)},
    //  static native int getNamedCon(int which, Object[] name)
    {CC "getNamedCon",               CC "(I[" OBJ ")I",                        FN_PTR(MHN_getNamedCon)},
    //  static native int getMembers(Class<?> defc, String matchName, String matchSig,
    //          int matchFlags, Class<?> caller, int skip, MemberName[] results);
    {CC "getMembers",                CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)},