Skip to content

8365052: G1: Remove G1CollectionSet::groups() accessors #26688

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 9 commits into from
Closed

8365052: G1: Remove G1CollectionSet::groups() accessors #26688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c337716
8364925
tschatzl Aug 6, 2025
141d18d
* remove accidentally merged in JDK-8364934
tschatzl Aug 6, 2025
19e3308
8364934
tschatzl Aug 6, 2025
1c8188f
* ayang review
tschatzl Aug 7, 2025
8a1a6e7
Merge branch '8364925-improve-program-flow-inc-cset' into 8364934-g1c…
tschatzl Aug 7, 2025
b0f3180
* one more renaming: prepare_groups_for_scan() -> prepare_for_scan()
tschatzl Aug 7, 2025
a7d6841
8365052
tschatzl Aug 7, 2025
622fc5a
Merge branch 'master' into 8365052-remove-groups-accessors
tschatzl Aug 21, 2025
3e1c70b
Merge branch 'master' into 8365052-remove-groups-accessors
tschatzl Aug 22, 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
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/g1/g1CollectionSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void G1CollectionSet::abandon_all_candidates() {
}

void G1CollectionSet::prepare_for_scan () {
groups()->prepare_for_scan();
_groups.prepare_for_scan();
}

void G1CollectionSet::add_old_region(G1HeapRegion* hr) {
Expand Down
3 changes: 0 additions & 3 deletions src/hotspot/share/gc/g1/g1CollectionSet.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@ class G1CollectionSet {
G1CollectionSetCandidates* candidates() { return &_candidates; }
const G1CollectionSetCandidates* candidates() const { return &_candidates; }

G1CSetCandidateGroupList* groups() { return &_groups; }
const G1CSetCandidateGroupList* groups() const { return &_groups; }

void prepare_for_scan();

void init_region_lengths(uint eden_cset_region_length,
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ inline void G1CollectionSet::merge_cardsets_for_collection_groups(CardOrRangeVis
uint cur_pos = start_pos;
uint count = 0;
do {
G1HeapRegionRemSet::iterate_for_merge(groups()->at(offset + cur_pos)->card_set(), cl);
G1HeapRegionRemSet::iterate_for_merge(_groups.at(offset + cur_pos)->card_set(), cl);
cur_pos++;
count++;
if (cur_pos == length) {
Expand Down