Skip to content

transform sgen_get_descriptor to parallel safe version in job_major_mod_union_preclean #63293

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.

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

Merged
merged 1 commit into from
Jan 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/mono/mono/sgen/sgen-cardtable.c
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,9 @@ sgen_cardtable_scan_object (GCObject *obj, mword block_obj_size, guint8 *cards,
HEAVY_STAT (++bloby_objects);
if (cards) {
if (sgen_card_table_is_range_marked (cards, (mword)obj, block_obj_size))
ctx.ops->scan_object (obj, sgen_obj_get_descriptor (obj), ctx.queue);
ctx.ops->scan_object (obj, sgen_obj_get_descriptor_safe (obj), ctx.queue);
} else if (sgen_card_table_region_begin_scanning ((mword)obj, block_obj_size)) {
ctx.ops->scan_object (obj, sgen_obj_get_descriptor (obj), ctx.queue);
ctx.ops->scan_object (obj, sgen_obj_get_descriptor_safe (obj), ctx.queue);
}

sgen_binary_protocol_card_scan (obj, sgen_safe_object_get_size (obj));
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/sgen/sgen-marksweep.c
Original file line number Diff line number Diff line change
Expand Up @@ -2661,7 +2661,7 @@ scan_card_table_for_block (MSBlockInfo *block, CardTableScanType scan_type, Scan

if (small_objects) {
HEAVY_STAT (++scanned_objects);
scan_func (object, sgen_obj_get_descriptor (object), queue);
scan_func (object, sgen_obj_get_descriptor_safe (object), queue);
} else {
size_t offset = sgen_card_table_get_card_offset (obj, block_start);
sgen_cardtable_scan_object (object, block_obj_size, card_base + offset, ctx);
Expand Down