src/hotspot/share/classfile/systemDictionary.cpp

*** 1975,12 ***
  
    // Allocate private object used as system class loader lock
    oop lock_obj = oopFactory::new_intArray(0, CHECK);
    _system_loader_lock_obj = OopHandle(Universe::vm_global(), lock_obj);
  
!   // Initialize basic classes
    resolve_well_known_classes(CHECK);
  }
  
  // Compact table of directions on the initialization of klasses:
  static const short wk_init_info[] = {
    #define WK_KLASS_INIT_INFO(name, symbol) \
--- 1975,16 ---
  
    // Allocate private object used as system class loader lock
    oop lock_obj = oopFactory::new_intArray(0, CHECK);
    _system_loader_lock_obj = OopHandle(Universe::vm_global(), lock_obj);
  
!   // Resolve basic classes
    resolve_well_known_classes(CHECK);
+   // Resolve classes used by archived heap objects
+   if (UseSharedSpaces) {
+     HeapShared::resolve_classes(CHECK);
+   }
  }
  
  // Compact table of directions on the initialization of klasses:
  static const short wk_init_info[] = {
    #define WK_KLASS_INIT_INFO(name, symbol) \