Skip to content

Move to Rust 1.83 #89

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
Jan 6, 2025
Merged

Move to Rust 1.83 #89

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
c9ff860
Move to Rust 1.83
qinsoon Jan 6, 2025
e529cad
Update mmtk-core to ec745353a8de72b645613e0fef3ab7f5f1ad9bd1
mmtkgc-bot Jan 6, 2025
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
8 changes: 4 additions & 4 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 @@ -27,7 +27,7 @@ log = "*"
# - 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 = "45cdf31055b1b6a629bdb8032adaa6dd5a8e32b9" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" }
# Uncomment the following and fix the path to mmtk-core to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
2 changes: 1 addition & 1 deletion mmtk/rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.77.0
1.83.0
6 changes: 0 additions & 6 deletions mmtk/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,6 @@ pub extern "C" fn total_bytes(mmtk: &mut MMTK<V8>) -> usize {
memory_manager::total_bytes(&*mmtk)
}

#[no_mangle]
#[cfg(feature = "sanity")]
pub extern "C" fn scan_region(mmtk: &mut MMTK<V8>) {
memory_manager::scan_region(mmtk);
}

#[no_mangle]
pub extern "C" fn is_live_object(object: ObjectReference) -> bool {
memory_manager::is_live_object(object)
Expand Down
62 changes: 34 additions & 28 deletions mmtk/src/object_archive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,55 @@ pub extern "C" fn tph_archive_delete(arch: *mut c_void) {
};
}

fn with_archive_raw_pointer<F, R>(arch: *mut c_void, f: F) -> R
where
F: Fn(&mut ObjectArchive) -> R,
{
let mut arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
let res = f(&mut arch);
let _ = Box::into_raw(arch);
res
}

#[no_mangle]
pub extern "C" fn tph_archive_iter_reset(arch: *mut c_void) {
let mut arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
arch.reset_iterator();
Box::into_raw(arch);
with_archive_raw_pointer(arch, |arch| {
arch.reset_iterator();
})
}

#[no_mangle]
pub extern "C" fn tph_archive_iter_next(arch: *mut c_void) -> *mut c_void {
let mut arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
let res = arch.next_object();
Box::into_raw(arch);
res.to_mut_ptr()
with_archive_raw_pointer(arch, |arch| arch.next_object().to_mut_ptr())
}

#[no_mangle]
pub extern "C" fn tph_archive_inner_to_obj(
arch: *mut c_void,
inner_ptr: *mut c_void,
) -> *mut c_void {
let arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
let res = arch.inner_addr_to_object(Address::from_mut_ptr(inner_ptr));
Box::into_raw(arch);
res.to_mut_ptr()
with_archive_raw_pointer(arch, |arch| {
arch.inner_addr_to_object(Address::from_mut_ptr(inner_ptr))
.to_mut_ptr()
})
}

#[no_mangle]
pub extern "C" fn tph_archive_obj_to_isolate(
arch: *mut c_void,
obj_ptr: *mut c_void,
) -> *mut c_void {
let arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
let res = arch.object_to_isolate(Address::from_mut_ptr(obj_ptr));
Box::into_raw(arch);
res.to_mut_ptr()
with_archive_raw_pointer(arch, |arch| {
arch.object_to_isolate(Address::from_mut_ptr(obj_ptr))
.to_mut_ptr()
})
}

#[no_mangle]
pub extern "C" fn tph_archive_obj_to_space(arch: *mut c_void, obj_ptr: *mut c_void) -> u8 {
let arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
let res = arch.object_to_space(Address::from_mut_ptr(obj_ptr));
Box::into_raw(arch);
res
with_archive_raw_pointer(arch, |arch| {
arch.object_to_space(Address::from_mut_ptr(obj_ptr))
})
}

#[no_mangle]
Expand All @@ -69,19 +75,19 @@ pub extern "C" fn tph_archive_insert(
iso_ptr: *mut c_void,
space: u8,
) {
let obj_addr = Address::from_mut_ptr(obj_ptr);
let iso_addr = Address::from_mut_ptr(iso_ptr);
let mut arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
arch.insert_object(obj_addr, iso_addr, space);
Box::into_raw(arch);
with_archive_raw_pointer(arch, |arch| {
let obj_addr = Address::from_mut_ptr(obj_ptr);
let iso_addr = Address::from_mut_ptr(iso_ptr);
arch.insert_object(obj_addr, iso_addr, space);
})
}

#[no_mangle]
pub extern "C" fn tph_archive_remove(arch: *mut c_void, obj_ptr: *mut c_void) {
let obj_addr = Address::from_mut_ptr(obj_ptr);
let mut arch = unsafe { Box::from_raw(arch as *mut ObjectArchive) };
arch.remove_object(obj_addr);
Box::into_raw(arch);
with_archive_raw_pointer(arch, |arch| {
let obj_addr = Address::from_mut_ptr(obj_ptr);
arch.remove_object(obj_addr);
})
}

pub struct ObjectArchive {
Expand Down
Loading