src/hotspot/share/classfile/systemDictionary.hpp

*** 24,34 ****
  
  #ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
  #define SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
  
  #include "classfile/classLoader.hpp"
- #include "classfile/systemDictionary_ext.hpp"
  #include "jvmci/systemDictionary_jvmci.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/symbol.hpp"
  #include "runtime/java.hpp"
  #include "runtime/reflectionUtils.hpp"
--- 24,33 ----
*** 184,193 ****
--- 183,193 ----
    /* support for CDS */                                                                                                  \
    do_klass(ByteArrayInputStream_klass,                  java_io_ByteArrayInputStream,              Pre                 ) \
    do_klass(File_klass,                                  java_io_File,                              Pre                 ) \
    do_klass(URL_klass,                                   java_net_URL,                              Pre                 ) \
    do_klass(Jar_Manifest_klass,                          java_util_jar_Manifest,                    Pre                 ) \
+   do_klass(jdk_internal_loader_ClassLoaders_klass,      jdk_internal_loader_ClassLoaders,          Pre                 ) \
    do_klass(jdk_internal_loader_ClassLoaders_AppClassLoader_klass,      jdk_internal_loader_ClassLoaders_AppClassLoader,       Pre ) \
    do_klass(jdk_internal_loader_ClassLoaders_PlatformClassLoader_klass, jdk_internal_loader_ClassLoaders_PlatformClassLoader,  Pre ) \
    do_klass(CodeSource_klass,                            java_security_CodeSource,                  Pre                 ) \
    do_klass(ParseUtil_klass,                             sun_net_www_ParseUtil,                     Pre                 ) \
                                                                                                                           \
*** 210,231 ****
    do_klass(Byte_klass,                                  java_lang_Byte,                            Pre                 ) \
    do_klass(Short_klass,                                 java_lang_Short,                           Pre                 ) \
    do_klass(Integer_klass,                               java_lang_Integer,                         Pre                 ) \
    do_klass(Long_klass,                                  java_lang_Long,                            Pre                 ) \
                                                                                                                           \
-   /* Extensions */                                                                                                       \
-   WK_KLASSES_DO_EXT(do_klass)                                                                                            \
    /* JVMCI classes. These are loaded on-demand. */                                                                       \
    JVMCI_WK_KLASSES_DO(do_klass)                                                                                          \
                                                                                                                           \
    /*end*/
  
  
  class SystemDictionary : AllStatic {
    friend class VMStructs;
    friend class SystemDictionaryHandles;
-   friend class SharedClassUtil;
  
   public:
    enum WKID {
      NO_WKID = 0,
  
--- 210,228 ----