equal
deleted
inserted
replaced
23 |
23 |
24 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP |
24 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP |
25 #define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP |
25 #define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP |
26 |
26 |
27 #include "gc/shenandoah/shenandoahAsserts.hpp" |
27 #include "gc/shenandoah/shenandoahAsserts.hpp" |
28 #include "gc/shenandoah/shenandoahForwarding.hpp" |
|
29 #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp" |
28 #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp" |
30 #include "gc/shenandoah/shenandoahConcurrentMark.hpp" |
29 #include "gc/shenandoah/shenandoahConcurrentMark.hpp" |
31 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" |
30 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp" |
32 #include "gc/shenandoah/shenandoahStringDedup.inline.hpp" |
31 #include "gc/shenandoah/shenandoahStringDedup.inline.hpp" |
33 #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp" |
32 #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp" |
68 } |
67 } |
69 |
68 |
70 inline void ShenandoahConcurrentMark::count_liveness(jushort* live_data, oop obj) { |
69 inline void ShenandoahConcurrentMark::count_liveness(jushort* live_data, oop obj) { |
71 size_t region_idx = _heap->heap_region_index_containing(obj); |
70 size_t region_idx = _heap->heap_region_index_containing(obj); |
72 ShenandoahHeapRegion* region = _heap->get_region(region_idx); |
71 ShenandoahHeapRegion* region = _heap->get_region(region_idx); |
73 size_t size = obj->size() + ShenandoahForwarding::word_size(); |
72 size_t size = obj->size(); |
74 |
73 |
75 if (!region->is_humongous_start()) { |
74 if (!region->is_humongous_start()) { |
76 assert(!region->is_humongous(), "Cannot have continuations here"); |
75 assert(!region->is_humongous(), "Cannot have continuations here"); |
77 size_t max = (1 << (sizeof(jushort) * 8)) - 1; |
76 size_t max = (1 << (sizeof(jushort) * 8)) - 1; |
78 if (size >= max) { |
77 if (size >= max) { |