Skip to content

Fix bug in line mark when MARK_LINE_AT_SCAN_TIME=false #1171

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

Merged
merged 4 commits into from
Jul 23, 2024
Merged

Fix bug in line mark when MARK_LINE_AT_SCAN_TIME=false #1171

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f6260f
Fix bug in line mark when `MARK_LINE_AT_SCAN_TIME=false`
k-sareen Jul 22, 2024
2ba4e7d
Delete trailing whitespace
k-sareen Jul 22, 2024
7cbc1ce
Update src/policy/immix/immixspace.rs
k-sareen Jul 22, 2024
0e2d40e
Update immixspace.rs
k-sareen Jul 22, 2024
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
9 changes: 9 additions & 0 deletions src/policy/immix/immixspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,11 @@ impl<VM: VMBinding> ImmixSpace<VM> {
// We won the forwarding race but the object is already marked so we clear the
// forwarding status and return the unmoved object
object_forwarding::clear_forwarding_bits::<VM>(object);

if !super::MARK_LINE_AT_SCAN_TIME {
self.mark_lines(object);
}

object
} else {
// We won the forwarding race; actually forward and copy the object if it is not pinned
Expand All @@ -646,6 +651,10 @@ impl<VM: VMBinding> ImmixSpace<VM> {
#[cfg(feature = "vo_bit")]
vo_bit::helper::on_object_marked::<VM>(object);

if !super::MARK_LINE_AT_SCAN_TIME {
self.mark_lines(object);
}

object
} else {
// We are forwarding objects. When the copy allocator allocates the block, it should
Expand Down