src/hotspot/share/memory/filemap.cpp

*** 29,58 ****
  #include "classfile/sharedClassUtil.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionaryShared.hpp"
  #include "classfile/altHashing.hpp"
- #if INCLUDE_ALL_GCS
- #include "gc/g1/g1CollectedHeap.hpp"
- #endif
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
  #include "logging/logMessage.hpp"
  #include "memory/filemap.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/oopFactory.hpp"
  #include "oops/objArrayOop.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/java.hpp"
  #include "runtime/os.hpp"
  #include "runtime/vm_version.hpp"
  #include "services/memTracker.hpp"
  #include "utilities/align.hpp"
  #include "utilities/defaultStream.hpp"
  
  # include <sys/stat.h>
  # include <errno.h>
  
  #ifndef O_BINARY       // if defined (Win32) use binary files.
--- 29,59 ----
  #include "classfile/sharedClassUtil.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionaryShared.hpp"
  #include "classfile/altHashing.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
  #include "logging/logMessage.hpp"
  #include "memory/filemap.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/oopFactory.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/objArrayOop.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/java.hpp"
  #include "runtime/os.hpp"
  #include "runtime/vm_version.hpp"
  #include "services/memTracker.hpp"
  #include "utilities/align.hpp"
  #include "utilities/defaultStream.hpp"
+ #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1CollectedHeap.hpp"
+ #endif
  
  # include <sys/stat.h>
  # include <errno.h>
  
  #ifndef O_BINARY       // if defined (Win32) use binary files.
*** 466,476 ****
      si->_file_offset = _file_offset;
    }
    if (MetaspaceShared::is_heap_region(region)) {
      assert((base - (char*)Universe::narrow_oop_base()) % HeapWordSize == 0, "Sanity");
      if (base != NULL) {
!       si->_addr._offset = (intx)oopDesc::encode_heap_oop_not_null((oop)base);
      } else {
        si->_addr._offset = 0;
      }
    } else {
      si->_addr._base = base;
--- 467,477 ----
      si->_file_offset = _file_offset;
    }
    if (MetaspaceShared::is_heap_region(region)) {
      assert((base - (char*)Universe::narrow_oop_base()) % HeapWordSize == 0, "Sanity");
      if (base != NULL) {
!       si->_addr._offset = (intx)CompressedOops::encode_not_null((oop)base);
      } else {
        si->_addr._offset = 0;
      }
    } else {
      si->_addr._base = base;
*** 781,791 ****
             i < first + max; i++) {
      si = &_header->_space[i];
      size_t used = si->_used;
      if (used > 0) {
        size_t size = used;
!       char* requested_addr = (char*)((void*)oopDesc::decode_heap_oop_not_null(
                                              (narrowOop)si->_addr._offset));
        regions[region_num] = MemRegion((HeapWord*)requested_addr, size / HeapWordSize);
        region_num ++;
      }
    }
--- 782,792 ----
             i < first + max; i++) {
      si = &_header->_space[i];
      size_t used = si->_used;
      if (used > 0) {
        size_t size = used;
!       char* requested_addr = (char*)((void*)CompressedOops::decode_not_null(
                                              (narrowOop)si->_addr._offset));
        regions[region_num] = MemRegion((HeapWord*)requested_addr, size / HeapWordSize);
        region_num ++;
      }
    }
*** 962,972 ****
  }
  
  char* FileMapInfo::FileMapHeader::region_addr(int idx) {
    if (MetaspaceShared::is_heap_region(idx)) {
      return _space[idx]._used > 0 ?
!              (char*)((void*)oopDesc::decode_heap_oop_not_null((narrowOop)_space[idx]._addr._offset)) : NULL;
    } else {
      return _space[idx]._addr._base;
    }
  }
  
--- 963,973 ----
  }
  
  char* FileMapInfo::FileMapHeader::region_addr(int idx) {
    if (MetaspaceShared::is_heap_region(idx)) {
      return _space[idx]._used > 0 ?
!              (char*)((void*)CompressedOops::decode_not_null((narrowOop)_space[idx]._addr._offset)) : NULL;
    } else {
      return _space[idx]._addr._base;
    }
  }