stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8325510: Serial: Remove redundant arg in non_clean_card_iterate

Browse Source 
Reviewed-by: kbarrett, tschatzl, stefank
This commit is contained in:
Albert Mingkun Yang 2024-02-09 11:05:42 +00:00
parent 71b46c38a8
commit d165d124b1
2 changed files with 9 additions and 14 deletions
src/hotspot/share/gc/serial
cardTableRS.cppcardTableRS.hpp

19
src/hotspot/share/gc/serial/cardTableRS.cpp

@ -37,7 +37,7 @@ void CardTableRS::scan_old_to_young_refs(TenuredSpace* sp) {
const MemRegion urasm = sp->used_region_at_save_marks();
if (!urasm.is_empty()) {
OldGenScanClosure cl(SerialHeap::heap()->young_gen());
non_clean_card_iterate(sp, urasm, &cl, this);
non_clean_card_iterate(sp, urasm, &cl);
}
}
@ -175,7 +175,6 @@ CardTable::CardValue* CardTableRS::find_first_dirty_card(CardValue* const start_
template<typename Func>
CardTable::CardValue* CardTableRS::find_first_clean_card(CardValue* const start_card,
CardValue* const end_card,
CardTableRS* ct,
Func& object_start) {
for (CardValue* current_card = start_card; current_card < end_card; /* empty */) {
if (is_dirty(current_card)) {
@ -184,7 +183,7 @@ CardTable::CardValue* CardTableRS::find_first_clean_card(CardValue* const start_
}
// A potential candidate.
HeapWord* addr = ct->addr_for(current_card);
HeapWord* addr = addr_for(current_card);
HeapWord* obj_start_addr = object_start(addr);
if (obj_start_addr == addr) {
@ -200,7 +199,7 @@ CardTable::CardValue* CardTableRS::find_first_clean_card(CardValue* const start_
}
// Final card occupied by obj.
CardValue* obj_final_card = ct->byte_for(obj_start_addr + obj->size() - 1);
CardValue* obj_final_card = byte_for(obj_start_addr + obj->size() - 1);
if (is_clean(obj_final_card)) {
return obj_final_card;
}
@ -235,8 +234,7 @@ static void scan_obj_with_limit(oop obj,
void CardTableRS::non_clean_card_iterate(TenuredSpace* sp,
MemRegion mr,
OldGenScanClosure* cl,
CardTableRS* ct) {
OldGenScanClosure* cl) {
struct {
HeapWord* start_addr;
HeapWord* end_addr;
@ -255,8 +253,8 @@ void CardTableRS::non_clean_card_iterate(TenuredSpace* sp,
return result;
};
CardValue* const start_card = ct->byte_for(mr.start());
CardValue* const end_card = ct->byte_for(mr.last()) + 1;
CardValue* const start_card = byte_for(mr.start());
CardValue* const end_card = byte_for(mr.last()) + 1;
// if mr.end() is not card-aligned, that final card should not be cleared
// because it can be annotated dirty due to old-to-young pointers in
@ -271,16 +269,15 @@ void CardTableRS::non_clean_card_iterate(TenuredSpace* sp,
return;
}
HeapWord* const addr_l = ct->addr_for(dirty_l);
HeapWord* const addr_l = addr_for(dirty_l);
HeapWord* obj_addr = object_start(addr_l);
CardValue* const dirty_r = find_first_clean_card(dirty_l + 1,
end_card,
ct,
object_start);
assert(dirty_l < dirty_r, "inv");
HeapWord* const addr_r = dirty_r == end_card ? mr.end()
: ct->addr_for(dirty_r);
: addr_for(dirty_r);
clear_cards(MIN2(dirty_l, clear_limit_card),
MIN2(dirty_r, clear_limit_card));

4
src/hotspot/share/gc/serial/cardTableRS.hpp

@ -56,7 +56,6 @@ class CardTableRS : public CardTable {
template<typename Func>
CardValue* find_first_clean_card(CardValue* start_card,
CardValue* end_card,
CardTableRS* ct,
Func& object_start);
public:
@ -89,8 +88,7 @@ public:
// of mr. Clears the dirty cards as they are processed.
void non_clean_card_iterate(TenuredSpace* sp,
MemRegion mr,
OldGenScanClosure* cl,
CardTableRS* ct);
OldGenScanClosure* cl);
bool is_in_young(const void* p) const override;
};