Skip to content

Commit 66bee25

Browse files
author
Ivan Walulya
committed
8338315: G1: G1CardTableEntryClosure:do_card_ptr remove unused parameter worker_id
Reviewed-by: tschatzl
1 parent 3dd07b9 commit 66bee25

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ class G1CardTableEntryClosure: public CHeapObj<mtGC> {
3636
typedef CardTable::CardValue CardValue;
3737

3838
// Process the card whose card table entry is "card_ptr".
39-
virtual void do_card_ptr(CardValue* card_ptr, uint worker_id) = 0;
39+
virtual void do_card_ptr(CardValue* card_ptr) = 0;
4040

4141
// Process all the card_ptrs in node.
4242
void apply_to_buffer(BufferNode* node, uint worker_id) {
4343
void** buffer = BufferNode::make_buffer_from_node(node);
4444
size_t capacity = node->capacity();
4545
for (size_t i = node->index(); i < capacity; ++i) {
4646
CardValue* card_ptr = static_cast<CardValue*>(buffer[i]);
47-
do_card_ptr(card_ptr, worker_id);
47+
do_card_ptr(card_ptr);
4848
}
4949
}
5050
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,11 +1230,10 @@ class G1MergeHeapRootsTask : public WorkerTask {
12301230
_cards_skipped(0)
12311231
{}
12321232

1233-
void do_card_ptr(CardValue* card_ptr, uint worker_id) {
1233+
void do_card_ptr(CardValue* card_ptr) override {
12341234
// The only time we care about recording cards that
12351235
// contain references that point into the collection set
12361236
// is during RSet updating within an evacuation pause.
1237-
// In this case worker_id should be the id of a GC worker thread.
12381237
assert(SafepointSynchronize::is_at_safepoint(), "not during an evacuation pause");
12391238

12401239
uint const region_idx = _ct->region_idx_for(card_ptr);
@@ -1342,6 +1341,7 @@ class G1MergeHeapRootsTask : public WorkerTask {
13421341
FREE_C_HEAP_ARRAY(Stack, _dirty_card_buffers);
13431342
}
13441343
}
1344+
13451345
virtual void work(uint worker_id) {
13461346
G1CollectedHeap* g1h = G1CollectedHeap::heap();
13471347
G1GCPhaseTimes* p = g1h->phase_times();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ class RedirtyLoggedCardTableEntryClosure : public G1CardTableEntryClosure {
522522
_g1_ct(g1h->card_table()),
523523
_evac_failure_regions(evac_failure_regions) { }
524524

525-
void do_card_ptr(CardValue* card_ptr, uint worker_id) {
525+
void do_card_ptr(CardValue* card_ptr) override {
526526
G1HeapRegion* hr = region_for_card(card_ptr);
527527

528528
// Should only dirty cards in regions that won't be freed.

0 commit comments

Comments
 (0)