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

8360288: Shenandoah crash at size_given_klass in op_degenerated

Browse Source 
Reviewed-by: shade
Backport-of: 3b44d7bfa4d78e3ec715fce1863e052852f33180
This commit is contained in:
William Kemper 2025-07-17 16:50:07 +00:00
parent 5cc7a31b3f
commit 347084bfbd
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View File

@ -1452,27 +1452,23 @@ void ShenandoahHeap::print_heap_regions_on(outputStream* st) const {
}
}
size_t ShenandoahHeap::trash_humongous_region_at(ShenandoahHeapRegion* start) {
size_t ShenandoahHeap::trash_humongous_region_at(ShenandoahHeapRegion* start) const {
assert(start->is_humongous_start(), "reclaim regions starting with the first one");
oop humongous_obj = cast_to_oop(start->bottom());
size_t size = humongous_obj->size();
size_t required_regions = ShenandoahHeapRegion::required_regions(size * HeapWordSize);
size_t index = start->index() + required_regions - 1;
assert(!start->has_live(), "liveness must be zero");
for(size_t i = 0; i < required_regions; i++) {
// Reclaim from tail. Otherwise, assertion fails when printing region to trace log,
// as it expects that every region belongs to a humongous region starting with a humongous start region.
ShenandoahHeapRegion* region = get_region(index --);
assert(region->is_humongous(), "expect correct humongous start or continuation");
// Do not try to get the size of this humongous object. STW collections will
// have already unloaded classes, so an unmarked object may have a bad klass pointer.
ShenandoahHeapRegion* region = start;
size_t index = region->index();
do {
assert(region->is_humongous(), "Expect correct humongous start or continuation");
assert(!region->is_cset(), "Humongous region should not be in collection set");
region->make_trash_immediate();
}
return required_regions;
region = get_region(++index);
} while (region != nullptr && region->is_humongous_continuation());
// Return number of regions trashed
return index - start->index();
}
class ShenandoahCheckCleanGCLABClosure : public ThreadClosure {

2
src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
View File

@ -828,7 +828,7 @@ public:
static inline void atomic_clear_oop(narrowOop* addr, oop compare);
static inline void atomic_clear_oop(narrowOop* addr, narrowOop compare);
size_t trash_humongous_region_at(ShenandoahHeapRegion *r);
size_t trash_humongous_region_at(ShenandoahHeapRegion *r) const;
static inline void increase_object_age(oop obj, uint additional_age);