src/hotspot/share/classfile/systemDictionary.cpp

*** 50,59 ****
--- 50,60 ----
  #include "interpreter/interpreter.hpp"
  #include "jfr/jfrEvents.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
  #include "memory/filemap.hpp"
+ #include "memory/heapShared.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/instanceKlass.hpp"
*** 2035,2051 ****
      // before the archived java objects are accessed by functions
      // such as java_lang_Class::restore_archived_mirror and
      // ConstantPool::restore_unshareable_info (restores the archived
      // resolved_references array object).
      //
!     // MetaspaceShared::fixup_mapped_heap_regions() fills the empty
      // spaces in the archived heap regions and may use
      // SystemDictionary::Object_klass(), so we can do this only after
      // Object_klass is resolved. See the above resolve_wk_klasses_through()
      // call. No mirror objects are accessed/restored in the above call.
      // Mirrors are restored after java.lang.Class is loaded.
!     MetaspaceShared::fixup_mapped_heap_regions();
  
      // 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
--- 2036,2052 ----
      // before the archived java objects are accessed by functions
      // such as java_lang_Class::restore_archived_mirror and
      // ConstantPool::restore_unshareable_info (restores the archived
      // resolved_references array object).
      //
!     // HeapShared::fixup_mapped_heap_regions() fills the empty
      // spaces in the archived heap regions and may use
      // SystemDictionary::Object_klass(), so we can do this only after
      // Object_klass is resolved. See the above resolve_wk_klasses_through()
      // call. No mirror objects are accessed/restored in the above call.
      // Mirrors are restored after java.lang.Class is loaded.
!     HeapShared::fixup_mapped_heap_regions();
  
      // 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