Skip to content

Update to MMTk core PR #1165 #86

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
mmtkgc-bot merged 2 commits into from
Jul 19, 2024
Merged

Update to MMTk core PR #1165 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
900c5eb
Update to MMTk core PR #1165
qinsoon Jul 11, 2024
cf0697f
Update mmtk-core to 5edfd858c2539db5698fbc2e8cc1c5b74d951e99
mmtkgc-bot Jul 19, 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 @@ -37,7 +37,7 @@ features = ["is_mmtk_object", "object_pinning", "sticky_immix_non_moving_nursery

# Uncomment the following lines to use mmtk-core from the official repository.
git = "https://github.com/mmtk/mmtk-core.git"
rev = "a3a72f8e5795678eff06fdc1524f0b429a62ccc0"
rev = "5edfd858c2539db5698fbc2e8cc1c5b74d951e99"

# Uncomment the following line to use mmtk-core from a local repository.
# path = "../../mmtk-core"
Expand Down
2 changes: 1 addition & 1 deletion mmtk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ pub extern "C" fn mmtk_get_forwarded_object(object: ObjectReference) -> Nullable
pub extern "C" fn mmtk_is_mmtk_object(addr: Address) -> bool {
debug_assert!(!addr.is_zero());
debug_assert!(addr.is_aligned_to(mmtk::util::is_mmtk_object::VO_BIT_REGION_SIZE));
memory_manager::is_mmtk_object(addr)
memory_manager::is_mmtk_object(addr).is_some()
}

#[no_mangle]
Expand Down
6 changes: 3 additions & 3 deletions mmtk/src/scanning.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl Scanning<Ruby> for VMScanning {
object_tracer: &mut OT,
) {
debug_assert!(
mmtk::memory_manager::is_mmtk_object(object.to_raw_address()),
mmtk::memory_manager::is_mmtk_object(object.to_raw_address()).is_some(),
"Not an MMTk object: {object}",
);
let gc_tls = unsafe { GCThreadTLS::from_vwt_check(tls) };
Expand All @@ -40,7 +40,7 @@ impl Scanning<Ruby> for VMScanning {
if pin { " pin" } else { "" }
);
debug_assert!(
mmtk::memory_manager::is_mmtk_object(target_object.to_raw_address()),
mmtk::memory_manager::is_mmtk_object(target_object.to_raw_address()).is_some(),
"Destination is not an MMTk object. Src: {object} dst: {target_object}"
);
let forwarded_target = object_tracer.trace_object(target_object);
Expand Down Expand Up @@ -173,7 +173,7 @@ impl VMScanning {
}
);
debug_assert!(
mmtk::memory_manager::is_mmtk_object(object.to_raw_address()),
mmtk::memory_manager::is_mmtk_object(object.to_raw_address()).is_some(),
"Root does not point to MMTk object. object: {object}"
);
buffer.push(object);
Expand Down
2 changes: 1 addition & 1 deletion mmtk/src/weak_proc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ trait GlobalTableProcessingWork {
// of `trace_object` due to the way it is used in `UPDATE_IF_MOVED`.
let forward_object = |_worker, object: ObjectReference, _pin| {
debug_assert!(
mmtk::memory_manager::is_mmtk_object(object.to_address::<Ruby>()),
mmtk::memory_manager::is_mmtk_object(object.to_address::<Ruby>()).is_some(),
"{} is not an MMTk object",
object
);
Expand Down