Skip to content

8372110: GenShen: Fix erroneous assert #28375

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
wants to merge 2 commits into from
Closed

8372110: GenShen: Fix erroneous assert #28375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86d9290
Fix erroneous assert
kdnilsen Nov 18, 2025
591f09e
Merge remote-tracking branch 'jdk/master' into fix-finish-block-start…
kdnilsen Nov 20, 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
7 changes: 4 additions & 3 deletions src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ HeapWord* ShenandoahCardCluster::first_object_start(const size_t card_index, con

HeapWord* right = MIN2(region->top(), end_range_of_interest);
HeapWord* end_of_search_next = MIN2(right, tams);
// Since end_range_of_interest may not align on a card boundary, last_relevant_card_index is conservative. Not all of the
// memory within the last relevant card's span is < right.
size_t last_relevant_card_index;
if (end_range_of_interest == _end_of_heap) {
last_relevant_card_index = _rs->card_index_for_addr(end_range_of_interest - 1);
Expand Down Expand Up @@ -352,9 +354,8 @@ HeapWord* ShenandoahCardCluster::first_object_start(const size_t card_index, con
return nullptr;
}
} while (!starts_object(following_card_index));
assert(_rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index),
"Result must precede right");
return _rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index);
HeapWord* result_candidate = _rs->addr_for_card_index(following_card_index) + get_first_start(following_card_index);
return (result_candidate >= right)? nullptr: result_candidate;
}
}
}
Expand Down