Move to Rust 1.83

mmtk · Jan 6, 2025 · de79af2 · de79af2
1 parent 71d2a58
commit de79af2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 16 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -29,7 +29,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
 # - change branch/rev
 # - 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 = "c0f97884234b51b13c8ba5d1563a8e0f592d11c2" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ac80c8de8ac551959839dfaa79e87c1a05a9e89c" }
 # Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
 # mmtk = { path = "../repos/mmtk-core" }
 
@@ -40,3 +40,4 @@ nogc = []
 semispace = []
 marksweep = []
 malloc_marksweep = ["mmtk/malloc_mark_sweep"]
+binding_side_ref_proc = []
diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain
@@ -1 +1 @@
-1.77.0
+1.83.0
diff --git a/mmtk/src/api.rs b/mmtk/src/api.rs
@@ -154,12 +154,6 @@ pub extern "C" fn total_bytes() -> usize {
     memory_manager::total_bytes(&SINGLETON)
 }
 
-#[no_mangle]
-#[cfg(feature = "sanity")]
-pub extern "C" fn scan_region() {
-    memory_manager::scan_region(&SINGLETON)
-}
-
 #[no_mangle]
 pub extern "C" fn handle_user_collection_request(tls: VMMutatorThread) {
     memory_manager::handle_user_collection_request::<JikesRVM>(&SINGLETON, tls);

diff --git a/mmtk/src/jikesrvm_calls/mod.rs b/mmtk/src/jikesrvm_calls/mod.rs
@@ -31,7 +31,7 @@ pub fn prepare_mutator(tls: VMWorkerThread, mutator_tls: VMMutatorThread) {
     unsafe {
         // asm! is not smart enough to figure out VMMutatorThread has repr(transparent) and
         // therefore the same representation as a pointer.
-        let mutator_tls_usize = std::mem::transmute::<_, usize>(mutator_tls);
+        let mutator_tls_usize = std::mem::transmute::<VMMutatorThread, usize>(mutator_tls);
         jtoc_call!(PREPARE_MUTATOR_METHOD_OFFSET, tls, mutator_tls_usize);
     }
 }

diff --git a/mmtk/src/scan_boot_image.rs b/mmtk/src/scan_boot_image.rs
@@ -98,12 +98,12 @@ fn process_chunk(
             /* enqueue the specified slot or slots */
             debug_assert!(conversions::is_address_aligned(Address::from_usize(offset)));
             let mut slot: Address = image_start + offset;
-            if cfg!(feature = "debug") {
+            if cfg!(debug_assertions) {
                 REFS.fetch_add(1, Ordering::Relaxed);
             }
 
             if !FILTER || slot.load::<Address>() > map_end {
-                if cfg!(feature = "debug") {
+                if cfg!(debug_assertions) {
                     ROOTS.fetch_add(1, Ordering::Relaxed);
                 }
                 report_slot(JikesRVMSlot::from_address(slot));
@@ -113,11 +113,11 @@ fn process_chunk(
                     offset += BYTES_IN_ADDRESS;
                     slot = image_start + offset;
                     debug_assert!(conversions::is_address_aligned(slot));
-                    if cfg!(feature = "debug") {
+                    if cfg!(debug_assertions) {
                         REFS.fetch_add(1, Ordering::Relaxed);
                     }
                     if !FILTER || slot.load::<Address>() > map_end {
-                        if cfg!(feature = "debug") {
+                        if cfg!(debug_assertions) {
                             ROOTS.fetch_add(1, Ordering::Relaxed);
                         }
                         // TODO: check_reference(slot) ?

diff --git a/mmtk/src/tib_layout_constants.rs b/mmtk/src/tib_layout_constants.rs
@@ -53,4 +53,4 @@ pub const TIB_FIRST_VIRTUAL_METHOD_INDEX: usize =
  *  <li>fits into a PowerPC 16bit immediate operand</li>
  *   </ul>
  */
-pub const NEEDS_DYNAMIC_LINK: isize = i16::min_value() as isize + 1;
+pub const NEEDS_DYNAMIC_LINK: isize = i16::MIN as isize + 1;