infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-03 10:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

8381154: Shenandoah: Region states could be read in wrong order for comparisons

Browse Source 
Reviewed-by: shade, ruili
This commit is contained in:
William Kemper 2026-04-30 18:03:51 +00:00
parent bf72998e7a
commit 4b45849b76
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
View File

@ -223,7 +223,9 @@ ShenandoahFreeSetPartitionId ShenandoahFreeSet::prepare_to_promote_in_place(size
}
inline bool ShenandoahFreeSet::can_allocate_from(ShenandoahHeapRegion *r) const {
return r->is_empty() || (r->is_trash() && !_heap->is_concurrent_weak_root_in_progress());
const auto state = r->state();
return ShenandoahHeapRegion::is_empty_state(state)
|| (ShenandoahHeapRegion::is_trash(state) && !_heap->is_concurrent_weak_root_in_progress());
}
inline bool ShenandoahFreeSet::can_allocate_from(size_t idx) const {
@ -666,7 +668,7 @@ void ShenandoahRegionPartitions::retire_range_from_partition(
#ifdef ASSERT
ShenandoahHeapRegion* r = ShenandoahHeap::heap()->get_region(idx);
assert (in_free_set(partition, idx), "Must be in partition to remove from partition");
assert(r->is_empty() || r->is_trash(), "Region must be empty or trash");
assert(r->is_empty_or_trash(), "Region must be empty or trash");
#endif
_membership[int(partition)].clear_bit(idx);
}
@ -2822,7 +2824,7 @@ size_t ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_o
// be collected in the near future.
if (r->is_trash() || !r->is_affiliated()) {
// OLD regions that have available memory are already in the old_collector free set.
assert(r->is_empty() || r->is_trash(), "Not affiliated implies region %zu is empty", r->index());
assert(r->is_empty_or_trash(), "Not affiliated implies region %zu is empty", r->index());
if (idx < old_collector_low_idx) {
old_collector_low_idx = idx;
}
@ -3166,7 +3168,7 @@ void ShenandoahFreeSet::log_status() {
size_t free = alloc_capacity(r);
max = MAX2(max, free);
size_t used_in_region = r->used();
if (r->is_empty() || r->is_trash()) {
if (r->is_empty_or_trash()) {
used_in_region = 0;
total_free_ext += free;
if (last_idx + 1 == idx) {

4
src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
View File

@ -197,11 +197,13 @@ public:
bool is_regular() const { return state() == _regular; }
bool is_humongous_continuation() const { return state() == _humongous_cont; }
bool is_regular_pinned() const { return state() == _pinned; }
bool is_trash() const { return state() == _trash; }
bool is_trash() const { return is_trash(state()); }
// Derived state predicates (boolean combinations of individual states)
bool static is_trash(RegionState state) { return state == _trash; }
bool static is_empty_state(RegionState state) { return state == _empty_committed || state == _empty_uncommitted; }
bool static is_humongous_start_state(RegionState state) { return state == _humongous_start || state == _pinned_humongous_start; }
bool is_empty_or_trash() const { auto cur_state = state(); return is_empty_state(cur_state) || cur_state == _trash; }
bool is_empty() const { return is_empty_state(this->state()); }
bool is_active() const { auto cur_state = state(); return !is_empty_state(cur_state) && cur_state != _trash; }
bool is_humongous_start() const { return is_humongous_start_state(state()); }