Skip to content

Commit 9024617

Browse files
wksmmtkgc-bot
andauthored
Fix write barrier parameter type (#273)
Upstream PR: mmtk/mmtk-core#1130 --------- Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>
1 parent 3d98c8b commit 9024617

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

mmtk/Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ memoffset = "0.9.0"
3232
# - change branch
3333
# - change repo name
3434
# But other changes including adding/removing whitespaces in commented lines may break the CI.
35-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a02803b4104519ff2289234101a2dd8ceedd1bc7" }
35+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "fea59e4f5cc6176093da1d8efa7d7b3b4b8d0fa7" }
3636
# Uncomment the following to build locally
3737
# mmtk = { path = "../repos/mmtk-core" }
3838

mmtk/src/api.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -401,12 +401,12 @@ pub extern "C" fn mmtk_object_reference_write_pre(
401401
mutator: *mut libc::c_void,
402402
src: ObjectReference,
403403
slot: Address,
404-
target: ObjectReference,
404+
target: NullableObjectReference,
405405
) {
406406
with_mutator!(|mutator| {
407407
mutator
408408
.barrier()
409-
.object_reference_write_pre(src, slot.into(), target);
409+
.object_reference_write_pre(src, slot.into(), target.into());
410410
})
411411
}
412412

@@ -416,12 +416,12 @@ pub extern "C" fn mmtk_object_reference_write_post(
416416
mutator: *mut libc::c_void,
417417
src: ObjectReference,
418418
slot: Address,
419-
target: ObjectReference,
419+
target: NullableObjectReference,
420420
) {
421421
with_mutator!(|mutator| {
422422
mutator
423423
.barrier()
424-
.object_reference_write_post(src, slot.into(), target);
424+
.object_reference_write_post(src, slot.into(), target.into());
425425
})
426426
}
427427

@@ -431,12 +431,12 @@ pub extern "C" fn mmtk_object_reference_write_slow(
431431
mutator: *mut libc::c_void,
432432
src: ObjectReference,
433433
slot: Address,
434-
target: ObjectReference,
434+
target: NullableObjectReference,
435435
) {
436436
with_mutator!(|mutator| {
437437
mutator
438438
.barrier()
439-
.object_reference_write_slow(src, slot.into(), target);
439+
.object_reference_write_slow(src, slot.into(), target.into());
440440
})
441441
}
442442

0 commit comments

Comments
 (0)