heapShared.inline.hpp (original) (raw)

@@ -25,13 +25,20 @@ #ifndef SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP #define SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP

#include "oops/compressedOops.inline.hpp" #include "memory/heapShared.hpp" +#if INCLUDE_G1GC +#include "gc/g1/g1Allocator.inline.hpp" +#endif

#if INCLUDE_CDS_JAVA_HEAP

+bool HeapShared::is_archived_object(oop p) {

return (p == NULL) ? false : G1ArchiveAllocator::is_archived_object(p); +}
inline oop HeapShared::decode_from_archive(narrowOop v) { assert(!CompressedOops::is_null(v), "narrow oop value can never be zero"); oop result = (oop)(void*)((uintptr_t)_narrow_oop_base + ((uintptr_t)v << _narrow_oop_shift)); assert(check_obj_alignment(result), "address not aligned: " INTPTR_FORMAT, p2i((void*) result)); return result;