equal
deleted
inserted
replaced
25 #ifndef SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP |
25 #ifndef SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP |
26 #define SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP |
26 #define SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP |
27 |
27 |
28 #include "oops/compressedOops.inline.hpp" |
28 #include "oops/compressedOops.inline.hpp" |
29 #include "memory/heapShared.hpp" |
29 #include "memory/heapShared.hpp" |
|
30 #if INCLUDE_G1GC |
|
31 #include "gc/g1/g1Allocator.inline.hpp" |
|
32 #endif |
30 |
33 |
31 #if INCLUDE_CDS_JAVA_HEAP |
34 #if INCLUDE_CDS_JAVA_HEAP |
|
35 |
|
36 bool HeapShared::is_archived_object(oop p) { |
|
37 return (p == NULL) ? false : G1ArchiveAllocator::is_archived_object(p); |
|
38 } |
32 |
39 |
33 inline oop HeapShared::decode_from_archive(narrowOop v) { |
40 inline oop HeapShared::decode_from_archive(narrowOop v) { |
34 assert(!CompressedOops::is_null(v), "narrow oop value can never be zero"); |
41 assert(!CompressedOops::is_null(v), "narrow oop value can never be zero"); |
35 oop result = (oop)(void*)((uintptr_t)_narrow_oop_base + ((uintptr_t)v << _narrow_oop_shift)); |
42 oop result = (oop)(void*)((uintptr_t)_narrow_oop_base + ((uintptr_t)v << _narrow_oop_shift)); |
36 assert(check_obj_alignment(result), "address not aligned: " INTPTR_FORMAT, p2i((void*) result)); |
43 assert(check_obj_alignment(result), "address not aligned: " INTPTR_FORMAT, p2i((void*) result)); |