Skip to content

Fix write barrier parameter type #273

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 2 commits into from
Apr 30, 2024
Merged

Fix write barrier parameter type #273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba2ed4c
Write barrier API change
wks Apr 29, 2024
339616f
Update mmtk-core to fea59e4f5cc6176093da1d8efa7d7b3b4b8d0fa7
mmtkgc-bot Apr 30, 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
4 changes: 2 additions & 2 deletions mmtk/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ memoffset = "0.9.0"
# - change branch
# - change repo name
# But other changes including adding/removing whitespaces in commented lines may break the CI.
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a02803b4104519ff2289234101a2dd8ceedd1bc7" }
mmtk = { git = "https://github.com/wks/mmtk-core.git", rev = "cc008e6e27627cafc30f81a3ffc19b984a1f88a7" }
# Uncomment the following to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
12 changes: 6 additions & 6 deletions mmtk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,12 @@ pub extern "C" fn mmtk_object_reference_write_pre(
mutator: *mut libc::c_void,
src: ObjectReference,
slot: Address,
target: ObjectReference,
target: NullableObjectReference,
) {
with_mutator!(|mutator| {
mutator
.barrier()
.object_reference_write_pre(src, slot.into(), target);
.object_reference_write_pre(src, slot.into(), target.into());
})
}

Expand All @@ -416,12 +416,12 @@ pub extern "C" fn mmtk_object_reference_write_post(
mutator: *mut libc::c_void,
src: ObjectReference,
slot: Address,
target: ObjectReference,
target: NullableObjectReference,
) {
with_mutator!(|mutator| {
mutator
.barrier()
.object_reference_write_post(src, slot.into(), target);
.object_reference_write_post(src, slot.into(), target.into());
})
}

Expand All @@ -431,12 +431,12 @@ pub extern "C" fn mmtk_object_reference_write_slow(
mutator: *mut libc::c_void,
src: ObjectReference,
slot: Address,
target: ObjectReference,
target: NullableObjectReference,
) {
with_mutator!(|mutator| {
mutator
.barrier()
.object_reference_write_slow(src, slot.into(), target);
.object_reference_write_slow(src, slot.into(), target.into());
})
}

Expand Down