Skip to content
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

Fix card marking issue #64748

Merged
merged 3 commits into from
Feb 8, 2022
Merged

Fix card marking issue #64748

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddf7309
Fix issue where we didn't clear cards at the ends of regions.
PeterSolMS Feb 3, 2022
cf006f1
Fix indentation.
PeterSolMS Feb 3, 2022
7e45927
Fix segment case
PeterSolMS Feb 7, 2022
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
15 changes: 11 additions & 4 deletions src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36106,6 +36106,8 @@ gc_heap::mark_through_cards_helper (uint8_t** poo, size_t& n_gen,
if (child_object_gen < current_gen)
{
cg_pointers_found++;
dprintf (4, ("cg pointer %Ix found, %Id so far",
(size_t)*poo, cg_pointers_found ));
}
#else //USE_REGIONS
assert (condemned_gen == -1);
Expand Down Expand Up @@ -36431,11 +36433,16 @@ void gc_heap::mark_through_cards_for_segments (card_fn fn, BOOL relocating CARD_
{
if (foundp && (cg_pointers_found == 0))
{
#ifndef USE_REGIONS
// in the segment case, need to recompute end_card so we don't clear cards
// for the next generation
end_card = card_of (end);
#endif
dprintf(3,(" Clearing cards [%Ix, %Ix[ ", (size_t)card_address(card),
(size_t)end));
clear_cards (card, card_of (end));
n_card_set -= (card_of (end) - card);
total_cards_cleared += (card_of (end) - card);
(size_t)card_address(end_card)));
clear_cards (card, end_card);
n_card_set -= (end_card - card);
total_cards_cleared += (end_card - card);
}
n_eph += cg_pointers_found;
cg_pointers_found = 0;
Expand Down