Skip to content

8373116: Genshen: arraycopy_work should be always done for arrays in old gen during young concurrent marking #28669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pengxiaolong wants to merge 14 commits into from
+10 −5
Closed

8373116: Genshen: arraycopy_work should be always done for arrays in old gen during young concurrent marking #28669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
63dbbed
arraycopy_work should be done unconditionally if the array is in an o…
pengxiaolong Dec 4, 2025
5cc5916
Merge branch 'openjdk:master' into JDK-8372498
pengxiaolong Dec 4, 2025
1500475
Add assert to check card table to sure card table is correct
pengxiaolong Dec 4, 2025
6cb8275
Assert only when the obj been pointed to is in young
pengxiaolong Dec 5, 2025
44938dc
Reorder the code
pengxiaolong Dec 5, 2025
5b951e6
uncomment the new added assert
pengxiaolong Dec 5, 2025
85acca0
Remove the asset code
pengxiaolong Dec 5, 2025
53316bd
Add asserts back, the elem_ptr must be dirty either in read or write …
pengxiaolong Dec 5, 2025
49ea3c9
Add include header shenandoahOldGeneration.hpp
pengxiaolong Dec 5, 2025
c649cf2
enqueue objects stored in old array at ShenandoahSATBBarrier when con…
pengxiaolong Dec 7, 2025
225b999
Also test is_generational
pengxiaolong Dec 8, 2025
dda8ff6
Remove card assert, pass IS_GENERATIONAL as template parameter
pengxiaolong Dec 8, 2025
fe272ab
Remove header
pengxiaolong Dec 8, 2025
9e186a8
Fix indent
pengxiaolong Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ class ShenandoahBarrierSet: public BarrierSet {
void write_ref_array(HeapWord* start, size_t count);

private:
template <class T>
inline void arraycopy_marking(T* dst, size_t count);
template <bool IS_GENERATIONAL, class T>
void arraycopy_marking(T* dst, size_t count);
template <class T>
inline void arraycopy_evacuation(T* src, size_t count);
template <class T>
Expand Down
11 changes: 8 additions & 3 deletions src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,11 @@ void ShenandoahBarrierSet::arraycopy_barrier(T* src, T* dst, size_t count) {
// If marking old or young, we must evaluate the SATB barrier. This will be the only
// action if we are not marking old. If we are marking old, we must still evaluate the
// load reference barrier for a young collection.
arraycopy_marking(dst, count);
if (_heap->mode()->is_generational()) {
arraycopy_marking<true>(dst, count);
} else {
arraycopy_marking<false>(dst, count);
}
}

if ((gc_state & ShenandoahHeap::EVACUATION) != 0) {
Expand All @@ -441,11 +445,12 @@ void ShenandoahBarrierSet::arraycopy_barrier(T* src, T* dst, size_t count) {
}
}

template <class T>
template <bool IS_GENERATIONAL, class T>
void ShenandoahBarrierSet::arraycopy_marking(T* dst, size_t count) {
assert(_heap->is_concurrent_mark_in_progress(), "only during marking");
if (ShenandoahSATBBarrier) {
if (!_heap->marking_context()->allocated_after_mark_start(reinterpret_cast<HeapWord*>(dst))) {
if (!_heap->marking_context()->allocated_after_mark_start(reinterpret_cast<HeapWord*>(dst)) ||
(IS_GENERATIONAL && _heap->heap_region_containing(dst)->is_old() && _heap->is_concurrent_young_mark_in_progress())) {
arraycopy_work<T, false, false, true>(dst, count);
}
}
Expand Down