src/hotspot/share/memory/heapShared.cpp

*** 26,36 ****
  #include "classfile/javaClasses.inline.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "logging/log.hpp"
  #include "logging/logMessage.hpp"
  #include "logging/logStream.hpp"
! #include "memory/heapShared.hpp"
  #include "memory/iterator.inline.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
--- 26,36 ----
  #include "classfile/javaClasses.inline.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "logging/log.hpp"
  #include "logging/logMessage.hpp"
  #include "logging/logStream.hpp"
! #include "memory/heapShared.inline.hpp"
  #include "memory/iterator.inline.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
*** 68,77 ****
--- 68,80 ----
    info = new KlassSubGraphInfo(relocated_k, _subgraph_info_list);
    _subgraph_info_list = info;
    return info;
  }
  
+ address   HeapShared::_narrow_oop_base;
+ int       HeapShared::_narrow_oop_shift;
+ 
  int HeapShared::num_of_subgraph_infos() {
    int num = 0;
    KlassSubGraphInfo* info = _subgraph_info_list;
    while (info != NULL) {
      num ++;
*** 309,319 ****
            int field_offset = entry_field_records->at(i);
            // The object refereced by the field becomes 'known' by GC from this
            // point. All objects in the subgraph reachable from the object are
            // also 'known' by GC.
            oop v = MetaspaceShared::materialize_archived_object(
!             CompressedOops::decode(entry_field_records->at(i+1)));
            m->obj_field_put(field_offset, v);
            i += 2;
          }
        }
  
--- 312,322 ----
            int field_offset = entry_field_records->at(i);
            // The object refereced by the field becomes 'known' by GC from this
            // point. All objects in the subgraph reachable from the object are
            // also 'known' by GC.
            oop v = MetaspaceShared::materialize_archived_object(
!             entry_field_records->at(i+1));
            m->obj_field_put(field_offset, v);
            i += 2;
          }
        }
  
*** 501,506 ****
--- 504,515 ----
    archive_object_graph_do(SystemDictionary::ArchivedModuleGraph_klass(), jdk_internal_module_ArchivedModuleGraph::archivedMainModule_offset(), T_OBJECT, CHECK)
  
  void HeapShared::archive_module_graph_objects(Thread* THREAD) {
    do_module_object_graph(archive_reachable_objects_from_static_field);
  }
+ 
+ void HeapShared::init_narrow_oop_decoding(address base, int shift) {
+   _narrow_oop_base = base;
+   _narrow_oop_shift = shift;
+ }
+ 
  #endif // INCLUDE_CDS_JAVA_HEAP