Skip to content

Commit f61b247

Browse files
author
Thomas Schatzl
committed
8364962: G1: Inline G1CollectionSet::finalize_incremental_building
Reviewed-by: ayang, kbarrett
1 parent ed260e8 commit f61b247

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

src/hotspot/share/gc/g1/g1CollectionSet.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,6 @@ void G1CollectionSet::stop_incremental_building() {
149149
_inc_build_state = Inactive;
150150
}
151151

152-
void G1CollectionSet::finalize_incremental_building() {
153-
assert(_inc_build_state == Active, "Precondition");
154-
assert(SafepointSynchronize::is_at_safepoint(), "should be at a safepoint");
155-
}
156-
157152
void G1CollectionSet::clear() {
158153
assert_at_safepoint_on_vm_thread();
159154
_collection_set_cur_length = 0;
@@ -306,9 +301,10 @@ void G1CollectionSet::print(outputStream* st) {
306301
// pinned by JNI) to allow faster future evacuation. We already "paid" for this work
307302
// when sizing the young generation.
308303
double G1CollectionSet::finalize_young_part(double target_pause_time_ms, G1SurvivorRegions* survivors) {
309-
Ticks start_time = Ticks::now();
304+
assert(_inc_build_state == Active, "Precondition");
305+
assert(SafepointSynchronize::is_at_safepoint(), "should be at a safepoint");
310306

311-
finalize_incremental_building();
307+
Ticks start_time = Ticks::now();
312308

313309
guarantee(target_pause_time_ms > 0.0,
314310
"target_pause_time_ms = %1.6lf should be positive", target_pause_time_ms);

src/hotspot/share/gc/g1/g1CollectionSet.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@ class G1CollectionSet {
198198
// as Eden and calculate a prediction on how long the evacuation of all young regions
199199
// will take.
200200
double finalize_young_part(double target_pause_time_ms, G1SurvivorRegions* survivors);
201-
// Perform any final calculations on the incremental collection set fields before we
202-
// can use them.
203-
void finalize_incremental_building();
204201

205202
// Select the regions comprising the initial and optional collection set from marking
206203
// and retained collection set candidates.

0 commit comments

Comments
 (0)