equal
deleted
inserted
replaced
25 #ifndef SHARE_MEMORY_HEAPSHARED_INLINE_HPP |
25 #ifndef SHARE_MEMORY_HEAPSHARED_INLINE_HPP |
26 #define SHARE_MEMORY_HEAPSHARED_INLINE_HPP |
26 #define SHARE_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 #include "utilities/align.hpp" |
30 #if INCLUDE_G1GC |
31 #if INCLUDE_G1GC |
31 #include "gc/g1/g1Allocator.inline.hpp" |
32 #include "gc/g1/g1Allocator.inline.hpp" |
32 #endif |
33 #endif |
33 |
34 |
34 #if INCLUDE_CDS_JAVA_HEAP |
35 #if INCLUDE_CDS_JAVA_HEAP |
38 } |
39 } |
39 |
40 |
40 inline oop HeapShared::decode_from_archive(narrowOop v) { |
41 inline oop HeapShared::decode_from_archive(narrowOop v) { |
41 assert(!CompressedOops::is_null(v), "narrow oop value can never be zero"); |
42 assert(!CompressedOops::is_null(v), "narrow oop value can never be zero"); |
42 oop result = (oop)(void*)((uintptr_t)_narrow_oop_base + ((uintptr_t)v << _narrow_oop_shift)); |
43 oop result = (oop)(void*)((uintptr_t)_narrow_oop_base + ((uintptr_t)v << _narrow_oop_shift)); |
43 assert(check_obj_alignment(result), "address not aligned: " INTPTR_FORMAT, p2i((void*) result)); |
44 assert(is_object_aligned(result), "address not aligned: " INTPTR_FORMAT, p2i((void*) result)); |
44 return result; |
45 return result; |
45 } |
46 } |
46 |
47 |
47 #endif |
48 #endif |
48 |
49 |