src/hotspot/share/memory/metaspaceShared.cpp

*** 423,438 ****
    SymbolTable::serialize(soc);
    StringTable::serialize(soc);
    soc->do_tag(--tag);
  
    JavaClasses::serialize_offsets(soc);
    soc->do_tag(--tag);
  
    soc->do_tag(666);
  }
  
-   InstanceMirrorKlass::serialize_offsets(soc);
  address MetaspaceShared::cds_i2i_entry_code_buffers(size_t total_size) {
    if (DumpSharedSpaces) {
      if (_cds_i2i_entry_code_buffers == NULL) {
        _cds_i2i_entry_code_buffers = (address)misc_code_space_alloc(total_size);
        _cds_i2i_entry_code_buffers_size = total_size;
--- 423,438 ----
    SymbolTable::serialize(soc);
    StringTable::serialize(soc);
    soc->do_tag(--tag);
  
    JavaClasses::serialize_offsets(soc);
+   InstanceMirrorKlass::serialize_offsets(soc);
    soc->do_tag(--tag);
  
    soc->do_tag(666);
  }
  
  address MetaspaceShared::cds_i2i_entry_code_buffers(size_t total_size) {
    if (DumpSharedSpaces) {
      if (_cds_i2i_entry_code_buffers == NULL) {
        _cds_i2i_entry_code_buffers = (address)misc_code_space_alloc(total_size);
        _cds_i2i_entry_code_buffers_size = total_size;
*** 1839,1851 ****
      ResourceBitMap oopmap = HeapShared::calculate_oopmap(regions->at(i));
      size_t size_in_bits = oopmap.size();
      size_t size_in_bytes = oopmap.size_in_bytes();
      uintptr_t* buffer = (uintptr_t*)_ro_region.allocate(size_in_bytes, sizeof(intptr_t));
      oopmap.write_to(buffer, size_in_bytes);
!     log_info(cds)("Oopmap = " INTPTR_FORMAT " (%6d bytes) for heap region " INTPTR_FORMAT " (%8d bytes)",
!                   p2i(buffer), (int)(size_in_bytes),
!                   p2i(regions->at(i).start()), (int)regions->at(i).byte_size());
  
      ArchiveHeapOopmapInfo info;
      info._oopmap = (address)buffer;
      info._oopmap_size_in_bits = size_in_bits;
      oopmaps->append(info);
--- 1839,1852 ----
      ResourceBitMap oopmap = HeapShared::calculate_oopmap(regions->at(i));
      size_t size_in_bits = oopmap.size();
      size_t size_in_bytes = oopmap.size_in_bytes();
      uintptr_t* buffer = (uintptr_t*)_ro_region.allocate(size_in_bytes, sizeof(intptr_t));
      oopmap.write_to(buffer, size_in_bytes);
!     log_info(cds)("Oopmap = " INTPTR_FORMAT " (" SIZE_FORMAT_W(6) " bytes) for heap region "
!                   INTPTR_FORMAT " (" SIZE_FORMAT_W(8) " bytes)",
!                   p2i(buffer), size_in_bytes,
!                   p2i(regions->at(i).start()), regions->at(i).byte_size());
  
      ArchiveHeapOopmapInfo info;
      info._oopmap = (address)buffer;
      info._oopmap_size_in_bits = size_in_bits;
      oopmaps->append(info);