Skip to content

Commit a4a5385

Browse files
author
Thomas Schatzl
committed
8306733: Remove template parameter of G1DetermineCompactionQueueClosure::free_pinned_region
Reviewed-by: ayang, iwalulya
1 parent a98f587 commit a4a5385

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ class G1DetermineCompactionQueueClosure : public HeapRegionClosure {
4242
G1FullCollector* _collector;
4343
uint _cur_worker;
4444

45-
template<bool is_humongous>
46-
inline void free_pinned_region(HeapRegion* hr);
45+
inline void free_empty_humongous_region(HeapRegion* hr);
4746

4847
inline bool should_compact(HeapRegion* hr) const;
4948

src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,8 @@
3333
#include "gc/g1/g1FullGCScope.hpp"
3434
#include "gc/g1/heapRegion.inline.hpp"
3535

36-
template<bool is_humongous>
37-
void G1DetermineCompactionQueueClosure::free_pinned_region(HeapRegion* hr) {
38-
if (is_humongous) {
39-
_g1h->free_humongous_region(hr, nullptr);
40-
} else {
41-
_g1h->free_region(hr, nullptr);
42-
}
36+
void G1DetermineCompactionQueueClosure::free_empty_humongous_region(HeapRegion* hr) {
37+
_g1h->free_humongous_region(hr, nullptr);
4338
_collector->set_free(hr->hrm_index());
4439
add_to_compaction_queue(hr);
4540
}
@@ -88,7 +83,7 @@ inline bool G1DetermineCompactionQueueClosure::do_heap_region(HeapRegion* hr) {
8883
oop obj = cast_to_oop(hr->humongous_start_region()->bottom());
8984
bool is_empty = !_collector->mark_bitmap()->is_marked(obj);
9085
if (is_empty) {
91-
free_pinned_region<true>(hr);
86+
free_empty_humongous_region(hr);
9287
} else {
9388
_collector->set_has_humongous();
9489
}

0 commit comments

Comments
 (0)