src/hotspot/share/memory/metaspaceShared.cpp

*** 33,56 ****
  #include "classfile/symbolTable.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/systemDictionaryShared.hpp"
  #include "code/codeCache.hpp"
- #if INCLUDE_ALL_GCS
- #include "gc/g1/g1Allocator.inline.hpp"
- #include "gc/g1/g1CollectedHeap.hpp"
- #endif
  #include "gc/shared/gcLocker.hpp"
  #include "interpreter/bytecodeStream.hpp"
  #include "interpreter/bytecodes.hpp"
  #include "logging/log.hpp"
  #include "logging/logMessage.hpp"
  #include "memory/filemap.hpp"
  #include "memory/metaspace.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/instanceClassLoaderKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/instanceRefKlass.hpp"
  #include "oops/objArrayKlass.hpp"
  #include "oops/objArrayOop.hpp"
--- 33,53 ----
  #include "classfile/symbolTable.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/systemDictionaryShared.hpp"
  #include "code/codeCache.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "interpreter/bytecodeStream.hpp"
  #include "interpreter/bytecodes.hpp"
  #include "logging/log.hpp"
  #include "logging/logMessage.hpp"
  #include "memory/filemap.hpp"
  #include "memory/metaspace.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/instanceClassLoaderKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/instanceRefKlass.hpp"
  #include "oops/objArrayKlass.hpp"
  #include "oops/objArrayOop.hpp"
*** 64,73 ****
--- 61,74 ----
  #include "runtime/vmThread.hpp"
  #include "runtime/vm_operations.hpp"
  #include "utilities/align.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/hashtable.inline.hpp"
+ #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1Allocator.inline.hpp"
+ #include "gc/g1/g1CollectedHeap.hpp"
+ #endif
  
  ReservedSpace MetaspaceShared::_shared_rs;
  VirtualSpace MetaspaceShared::_shared_vs;
  MetaspaceSharedStats MetaspaceShared::_stats;
  bool MetaspaceShared::_has_error_classes;
*** 842,852 ****
        _dump_region->append_intptr_t(0);
      } else {
        assert(MetaspaceShared::is_heap_object_archiving_allowed(),
               "Archiving heap object is not allowed");
        _dump_region->append_intptr_t(
!         (intptr_t)oopDesc::encode_heap_oop_not_null(*o));
      }
    }
  
    void do_region(u_char* start, size_t size) {
      assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
--- 843,853 ----
        _dump_region->append_intptr_t(0);
      } else {
        assert(MetaspaceShared::is_heap_object_archiving_allowed(),
               "Archiving heap object is not allowed");
        _dump_region->append_intptr_t(
!         (intptr_t)CompressedOops::encode_not_null(*o));
      }
    }
  
    void do_region(u_char* start, size_t size) {
      assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
*** 1934,1944 ****
      } else {
        assert(MetaspaceShared::is_heap_object_archiving_allowed(),
               "Archived heap object is not allowed");
        assert(MetaspaceShared::open_archive_heap_region_mapped(),
               "Open archive heap region is not mapped");
!       RootAccess<IN_ARCHIVE_ROOT>::oop_store(p, oopDesc::decode_heap_oop_not_null(o));
      }
    }
  
    void do_region(u_char* start, size_t size) {
      assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");
--- 1935,1945 ----
      } else {
        assert(MetaspaceShared::is_heap_object_archiving_allowed(),
               "Archived heap object is not allowed");
        assert(MetaspaceShared::open_archive_heap_region_mapped(),
               "Open archive heap region is not mapped");
!       RootAccess<IN_ARCHIVE_ROOT>::oop_store(p, CompressedOops::decode(o));
      }
    }
  
    void do_region(u_char* start, size_t size) {
      assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment");