src/hotspot/share/classfile/systemDictionary.hpp

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

@@ -137,10 +137,11 @@
  
    static oop get_system_class_loader_impl(TRAPS);
    static oop get_platform_class_loader_impl(TRAPS);
  
   public:
+ 
    // Resolve either a hidden or normal class from a stream of bytes, based on ClassLoadInfo
    static InstanceKlass* resolve_from_stream(ClassFileStream* st,
                                              Symbol* class_name,
                                              Handle class_loader,
                                              const ClassLoadInfo& cl_info,

@@ -282,11 +283,11 @@
    static void add_nest_host_error(const constantPoolHandle& pool, int which,
                                    const stringStream& message);
    static const char* find_nest_host_error(const constantPoolHandle& pool, int which);
  
    static void add_to_initiating_loader(JavaThread* current, InstanceKlass* k,
-                                        ClassLoaderData* loader_data) NOT_CDS_RETURN;
+                                        ClassLoaderData* loader_data);
  
    static OopHandle  _java_system_loader;
    static OopHandle  _java_platform_loader;
  
  private:

@@ -315,11 +316,11 @@
                                        Handle class_loader);
    static bool is_shared_class_visible_impl(Symbol* class_name,
                                             InstanceKlass* ik,
                                             PackageEntry* pkg_entry,
                                             Handle class_loader);
-   static bool check_shared_class_super_type(InstanceKlass* klass, InstanceKlass* super,
+   static bool check_shared_class_dependency(InstanceKlass* klass, InstanceKlass* dependency,
                                              Handle class_loader,
                                              bool is_superclass, TRAPS);
    static bool check_shared_class_super_types(InstanceKlass* ik, Handle class_loader, TRAPS);
    // Second part of load_shared_class
    static void load_shared_class_misc(InstanceKlass* ik, ClassLoaderData* loader_data) NOT_CDS_RETURN;

@@ -328,10 +329,12 @@
  protected:
    // Used by AOTLinkedClassBulkLoader, LambdaProxyClassDictionary, VMClasses and SystemDictionaryShared
  
    static bool add_loader_constraint(Symbol* name, Klass* klass_being_linked,  Handle loader1,
                                      Handle loader2);
+   static bool preload_from_required_inline_field(InstanceKlass* ik, Handle class_loader, Symbol* sig, int field_index, TRAPS);
+   static void try_preload_from_loadable_descriptors(InstanceKlass* ik, Handle class_loader, Symbol* sig, int field_index, TRAPS);
    static InstanceKlass* load_shared_class(InstanceKlass* ik,
                                            Handle class_loader,
                                            Handle protection_domain,
                                            const ClassFileStream *cfs,
                                            PackageEntry* pkg_entry,