src/hotspot/share/classfile/systemDictionary.cpp

*** 1906,1916 ****
    _pd_cache_table = new ProtectionDomainCacheTable(defaultProtectionDomainCacheSize);
  
    // Allocate private object used as system class loader lock
    _system_loader_lock_obj = oopFactory::new_intArray(0, CHECK);
    // Initialize basic classes
!   initialize_preloaded_classes(CHECK);
  }
  
  // Compact table of directions on the initialization of klasses:
  static const short wk_init_info[] = {
    #define WK_KLASS_INIT_INFO(name, symbol, option) \
--- 1906,1916 ----
    _pd_cache_table = new ProtectionDomainCacheTable(defaultProtectionDomainCacheSize);
  
    // Allocate private object used as system class loader lock
    _system_loader_lock_obj = oopFactory::new_intArray(0, CHECK);
    // Initialize basic classes
!   resolve_preloaded_classes(CHECK);
  }
  
  // Compact table of directions on the initialization of klasses:
  static const short wk_init_info[] = {
    #define WK_KLASS_INIT_INFO(name, symbol, option) \
*** 1920,1930 ****
    WK_KLASSES_DO(WK_KLASS_INIT_INFO)
    #undef WK_KLASS_INIT_INFO
    0
  };
  
! bool SystemDictionary::initialize_wk_klass(WKID id, int init_opt, TRAPS) {
    assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
    int  info = wk_init_info[id - FIRST_WKID];
    int  sid  = (info >> CEIL_LG_OPTION_LIMIT);
    Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid);
    InstanceKlass** klassp = &_well_known_klasses[id];
--- 1920,1930 ----
    WK_KLASSES_DO(WK_KLASS_INIT_INFO)
    #undef WK_KLASS_INIT_INFO
    0
  };
  
! bool SystemDictionary::resolve_wk_klass(WKID id, int init_opt, TRAPS) {
    assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
    int  info = wk_init_info[id - FIRST_WKID];
    int  sid  = (info >> CEIL_LG_OPTION_LIMIT);
    Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid);
    InstanceKlass** klassp = &_well_known_klasses[id];
*** 1950,1975 ****
      (*klassp) = (k == NULL) ? NULL : InstanceKlass::cast(k);
    }
    return ((*klassp) != NULL);
  }
  
! void SystemDictionary::initialize_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS) {
    assert((int)start_id <= (int)limit_id, "IDs are out of order!");
    for (int id = (int)start_id; id < (int)limit_id; id++) {
      assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
      int info = wk_init_info[id - FIRST_WKID];
      int sid  = (info >> CEIL_LG_OPTION_LIMIT);
      int opt  = (info & right_n_bits(CEIL_LG_OPTION_LIMIT));
  
!     initialize_wk_klass((WKID)id, opt, CHECK);
    }
  
    // move the starting value forward to the limit:
    start_id = limit_id;
  }
  
! void SystemDictionary::initialize_preloaded_classes(TRAPS) {
    assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once");
  
    // Create the ModuleEntry for java.base.  This call needs to be done here,
    // after vmSymbols::initialize() is called but before any classes are pre-loaded.
    ClassLoader::classLoader_init2(CHECK);
--- 1950,1975 ----
      (*klassp) = (k == NULL) ? NULL : InstanceKlass::cast(k);
    }
    return ((*klassp) != NULL);
  }
  
! void SystemDictionary::resolve_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS) {
    assert((int)start_id <= (int)limit_id, "IDs are out of order!");
    for (int id = (int)start_id; id < (int)limit_id; id++) {
      assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
      int info = wk_init_info[id - FIRST_WKID];
      int sid  = (info >> CEIL_LG_OPTION_LIMIT);
      int opt  = (info & right_n_bits(CEIL_LG_OPTION_LIMIT));
  
!     resolve_wk_klass((WKID)id, opt, CHECK);
    }
  
    // move the starting value forward to the limit:
    start_id = limit_id;
  }
  
! void SystemDictionary::resolve_preloaded_classes(TRAPS) {
    assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once");
  
    // Create the ModuleEntry for java.base.  This call needs to be done here,
    // after vmSymbols::initialize() is called but before any classes are pre-loaded.
    ClassLoader::classLoader_init2(CHECK);
*** 1977,1994 ****
    // Preload commonly used klasses
    WKID scan = FIRST_WKID;
    // first do Object, then String, Class
  #if INCLUDE_CDS
    if (UseSharedSpaces) {
!     initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Object_klass), scan, CHECK);
      // Initialize the constant pool for the Object_class
      Object_klass()->constants()->restore_unshareable_info(CHECK);
!     initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
    } else
  #endif
    {
!     initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
    }
  
    // Calculate offsets for String and Class classes since they are loaded and
    // can be used after this point.
    java_lang_String::compute_offsets();
--- 1977,1994 ----
    // Preload commonly used klasses
    WKID scan = FIRST_WKID;
    // first do Object, then String, Class
  #if INCLUDE_CDS
    if (UseSharedSpaces) {
!     resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Object_klass), scan, CHECK);
      // Initialize the constant pool for the Object_class
      Object_klass()->constants()->restore_unshareable_info(CHECK);
!     resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
    } else
  #endif
    {
!     resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
    }
  
    // Calculate offsets for String and Class classes since they are loaded and
    // can be used after this point.
    java_lang_String::compute_offsets();
*** 2001,2028 ****
    // in the perm gen.
    Universe::initialize_basic_type_mirrors(CHECK);
    Universe::fixup_mirrors(CHECK);
  
    // do a bunch more:
!   initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK);
  
    // Preload ref klasses and set reference types
    InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER);
    InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
  
!   initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK);
    InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT);
    InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK);
    InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL);
    InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
  
    // JSR 292 classes
    WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
    WKID jsr292_group_end   = WK_KLASS_ENUM_NAME(VolatileCallSite_klass);
!   initialize_wk_klasses_until(jsr292_group_start, scan, CHECK);
!   initialize_wk_klasses_through(jsr292_group_end, scan, CHECK);
!   initialize_wk_klasses_until(NOT_JVMCI(WKID_LIMIT) JVMCI_ONLY(FIRST_JVMCI_WKID), scan, CHECK);
  
    _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass);
    _box_klasses[T_CHAR]    = WK_KLASS(Character_klass);
    _box_klasses[T_FLOAT]   = WK_KLASS(Float_klass);
    _box_klasses[T_DOUBLE]  = WK_KLASS(Double_klass);
--- 2001,2028 ----
    // in the perm gen.
    Universe::initialize_basic_type_mirrors(CHECK);
    Universe::fixup_mirrors(CHECK);
  
    // do a bunch more:
!   resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK);
  
    // Preload ref klasses and set reference types
    InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER);
    InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass));
  
!   resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK);
    InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT);
    InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK);
    InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL);
    InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM);
  
    // JSR 292 classes
    WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
    WKID jsr292_group_end   = WK_KLASS_ENUM_NAME(VolatileCallSite_klass);
!   resolve_wk_klasses_until(jsr292_group_start, scan, CHECK);
!   resolve_wk_klasses_through(jsr292_group_end, scan, CHECK);
!   resolve_wk_klasses_until(NOT_JVMCI(WKID_LIMIT) JVMCI_ONLY(FIRST_JVMCI_WKID), scan, CHECK);
  
    _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass);
    _box_klasses[T_CHAR]    = WK_KLASS(Character_klass);
    _box_klasses[T_FLOAT]   = WK_KLASS(Float_klass);
    _box_klasses[T_DOUBLE]  = WK_KLASS(Double_klass);