src/hotspot/share/oops/instanceKlass.cpp

*** 451,461 ****
  
    assert(NULL == _methods, "underlying memory not zeroed?");
    assert(is_instance_klass(), "is layout incorrect?");
    assert(size_helper() == parser.layout_size(), "incorrect size_helper?");
  
!   if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
      SystemDictionaryShared::init_dumptime_info(this);
    }
  }
  
  void InstanceKlass::deallocate_methods(ClassLoaderData* loader_data,
--- 451,461 ----
  
    assert(NULL == _methods, "underlying memory not zeroed?");
    assert(is_instance_klass(), "is layout incorrect?");
    assert(size_helper() == parser.layout_size(), "incorrect size_helper?");
  
!   if (Arguments::is_dumping_archive()) {
      SystemDictionaryShared::init_dumptime_info(this);
    }
  }
  
  void InstanceKlass::deallocate_methods(ClassLoaderData* loader_data,
*** 601,611 ****
    if (annotations() != NULL && !annotations()->is_shared()) {
      MetadataFactory::free_metadata(loader_data, annotations());
    }
    set_annotations(NULL);
  
!   if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
      SystemDictionaryShared::remove_dumptime_info(this);
    }
  }
  
  bool InstanceKlass::should_be_initialized() const {
--- 601,611 ----
    if (annotations() != NULL && !annotations()->is_shared()) {
      MetadataFactory::free_metadata(loader_data, annotations());
    }
    set_annotations(NULL);
  
!   if (Arguments::is_dumping_archive()) {
      SystemDictionaryShared::remove_dumptime_info(this);
    }
  }
  
  bool InstanceKlass::should_be_initialized() const {
*** 2227,2237 ****
    // We store the fingerprint into the InstanceKlass only in the following 2 cases:
    if (CalculateClassFingerprint) {
      // (1) We are running AOT to generate a shared library.
      return true;
    }
!   if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
      // (2) We are running -Xshare:dump or -XX:ArchiveClassesAtExit to create a shared archive
      return true;
    }
    if (UseAOT && is_unsafe_anonymous) {
      // (3) We are using AOT code from a shared library and see an unsafe anonymous class
--- 2227,2237 ----
    // We store the fingerprint into the InstanceKlass only in the following 2 cases:
    if (CalculateClassFingerprint) {
      // (1) We are running AOT to generate a shared library.
      return true;
    }
!   if (Arguments::is_dumping_archive()) {
      // (2) We are running -Xshare:dump or -XX:ArchiveClassesAtExit to create a shared archive
      return true;
    }
    if (UseAOT && is_unsafe_anonymous) {
      // (3) We are using AOT code from a shared library and see an unsafe anonymous class
*** 2475,2485 ****
    }
  
    // notify ClassLoadingService of class unload
    ClassLoadingService::notify_class_unloaded(ik);
  
!   if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
      SystemDictionaryShared::remove_dumptime_info(ik);
    }
  
    if (log_is_enabled(Info, class, unload)) {
      ResourceMark rm;
--- 2475,2485 ----
    }
  
    // notify ClassLoadingService of class unload
    ClassLoadingService::notify_class_unloaded(ik);
  
!   if (Arguments::is_dumping_archive()) {
      SystemDictionaryShared::remove_dumptime_info(ik);
    }
  
    if (log_is_enabled(Info, class, unload)) {
      ResourceMark rm;