stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8264417: ParallelCompactData::region_offset should not accept pointers outside the current region

Browse Source 
Reviewed-by: tschatzl, iwalulya
This commit is contained in:
Albert Mingkun Yang 2021-03-31 11:35:10 +00:00
parent 604b14c43d
commit 999c134884
2 changed files with 7 additions and 6 deletions
src/hotspot/share/gc/parallel
psParallelCompact.cpppsParallelCompact.hpp

8
src/hotspot/share/gc/parallel/psParallelCompact.cpp

@ -534,6 +534,7 @@ void ParallelCompactData::add_obj(HeapWord* addr, size_t len)
{
const size_t obj_ofs = pointer_delta(addr, _region_start);
const size_t beg_region = obj_ofs >> Log2RegionSize;
// end_region is inclusive
const size_t end_region = (obj_ofs + len - 1) >> Log2RegionSize;
DEBUG_ONLY(Atomic::inc(&add_obj_count);)
@ -549,7 +550,6 @@ void ParallelCompactData::add_obj(HeapWord* addr, size_t len)
const size_t beg_ofs = region_offset(addr);
_region_data[beg_region].add_live_obj(RegionSize - beg_ofs);
Klass* klass = cast_to_oop(addr)->klass();
// Middle regions--completely spanned by this object.
for (size_t region = beg_region + 1; region < end_region; ++region) {
_region_data[region].set_partial_obj_size(RegionSize);
@ -565,8 +565,8 @@ void ParallelCompactData::add_obj(HeapWord* addr, size_t len)
void
ParallelCompactData::summarize_dense_prefix(HeapWord* beg, HeapWord* end)
{
assert(region_offset(beg) == 0, "not RegionSize aligned");
assert(region_offset(end) == 0, "not RegionSize aligned");
assert(is_region_aligned(beg), "not RegionSize aligned");
assert(is_region_aligned(end), "not RegionSize aligned");
size_t cur_region = addr_to_region_idx(beg);
const size_t end_region = addr_to_region_idx(end);
@ -762,7 +762,7 @@ bool ParallelCompactData::summarize(SplitInfo& split_info,
destination_count += 1;
// Data from cur_region will be copied to the start of dest_region_2.
_region_data[dest_region_2].set_source_region(cur_region);
} else if (region_offset(dest_addr) == 0) {
} else if (is_region_aligned(dest_addr)) {
// Data from cur_region will be copied to the start of the destination
// region.
_region_data[dest_region_1].set_source_region(cur_region);

5
src/hotspot/share/gc/parallel/psParallelCompact.hpp

@ -675,7 +675,8 @@ inline size_t
ParallelCompactData::region_offset(const HeapWord* addr) const
{
assert(addr >= _region_start, "bad addr");
assert(addr <= _region_end, "bad addr");
// would mistakenly return 0 for _region_end
assert(addr < _region_end, "bad addr");
return (size_t(addr) & RegionAddrOffsetMask) >> LogHeapWordSize;
}
@ -734,7 +735,7 @@ ParallelCompactData::region_align_up(HeapWord* addr) const
inline bool
ParallelCompactData::is_region_aligned(HeapWord* addr) const
{
return region_offset(addr) == 0;
return (size_t(addr) & RegionAddrOffsetMask) == 0;
}
inline size_t