src/hotspot/share/oops/klass.cpp

*** 33,42 ****
--- 33,43 ----
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.hpp"
  #include "runtime/handles.inline.hpp"
*** 567,577 ****
  #if INCLUDE_CDS_JAVA_HEAP
  // Used at CDS dump time to access the archived mirror. No GC barrier.
  oop Klass::archived_java_mirror_raw() {
    assert(DumpSharedSpaces, "called only during runtime");
    assert(has_raw_archived_mirror(), "must have raw archived mirror");
!   return oopDesc::decode_heap_oop(_archived_mirror);
  }
  
  // Used at CDS runtime to get the archived mirror from shared class. Uses GC barrier.
  oop Klass::archived_java_mirror() {
    assert(UseSharedSpaces, "UseSharedSpaces expected.");
--- 568,578 ----
  #if INCLUDE_CDS_JAVA_HEAP
  // Used at CDS dump time to access the archived mirror. No GC barrier.
  oop Klass::archived_java_mirror_raw() {
    assert(DumpSharedSpaces, "called only during runtime");
    assert(has_raw_archived_mirror(), "must have raw archived mirror");
!   return CompressedOops::decode(_archived_mirror);
  }
  
  // Used at CDS runtime to get the archived mirror from shared class. Uses GC barrier.
  oop Klass::archived_java_mirror() {
    assert(UseSharedSpaces, "UseSharedSpaces expected.");
*** 580,590 ****
  }
  
  // No GC barrier
  void Klass::set_archived_java_mirror_raw(oop m) {
    assert(DumpSharedSpaces, "called only during runtime");
!   _archived_mirror = oopDesc::encode_heap_oop(m);
  }
  #endif // INCLUDE_CDS_JAVA_HEAP
  
  Klass* Klass::array_klass_or_null(int rank) {
    EXCEPTION_MARK;
--- 581,591 ----
  }
  
  // No GC barrier
  void Klass::set_archived_java_mirror_raw(oop m) {
    assert(DumpSharedSpaces, "called only during runtime");
!   _archived_mirror = CompressedOops::encode(m);
  }
  #endif // INCLUDE_CDS_JAVA_HEAP
  
  Klass* Klass::array_klass_or_null(int rank) {
    EXCEPTION_MARK;