src/hotspot/share/prims/methodHandles.cpp

@@ -769,11 +769,11 @@
        LinkInfo link_info(defc, name, type, caller, access_check, loader_constraint_check);
        {
          assert(!HAS_PENDING_EXCEPTION, "");
          if (ref_kind == JVM_REF_invokeStatic) {
            LinkResolver::resolve_static_call(result,
-                         link_info, false, THREAD);
+                         link_info, StaticMode::dont_initialize_klass, THREAD);
          } else if (ref_kind == JVM_REF_invokeInterface) {
            LinkResolver::resolve_interface_call(result, Handle(), defc,
                          link_info, false, THREAD);
          } else if (mh_invoke_id != vmIntrinsics::_none) {
            assert(!is_signature_polymorphic_static(mh_invoke_id), "");

@@ -831,11 +831,11 @@
      {
        fieldDescriptor result; // find_field initializes fd if found
        {
          assert(!HAS_PENDING_EXCEPTION, "");
          LinkInfo link_info(defc, name, type, caller, LinkInfo::AccessCheck::skip, loader_constraint_check);
-         LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, false, THREAD);
+         LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, StaticMode::dont_initialize_klass, THREAD);
          if (HAS_PENDING_EXCEPTION) {
            if (speculative_resolve) {
              CLEAR_PENDING_EXCEPTION;
            }
            return empty;