Bump MMTk version

Author: peterzhu2118

Diff for: gc/mmtk/Cargo.lock

@@ -30,7 +30,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 = "160b7702fccda133c9407234821ad35103623179"
+rev = "a025c24104d8d456a865aa0122e6e0fb6d77e8f2"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 # path = "../../../mmtk/mmtk-core"

Diff for: gc/mmtk/Cargo.toml

@@ -25,12 +25,12 @@ pub type RubyMutator = Mutator<Ruby>;
 
 #[no_mangle]
 pub extern "C" fn mmtk_is_live_object(object: ObjectReference) -> bool {
-    memory_manager::is_live_object::<Ruby>(object)
+    memory_manager::is_live_object(object)
 }
 
 #[no_mangle]
 pub extern "C" fn mmtk_is_reachable(object: ObjectReference) -> bool {
-    object.is_reachable::<Ruby>()
+    object.is_reachable()
 }
 
 // =============== Bootup ===============

Diff for: gc/mmtk/src/api.rs

@@ -120,8 +120,6 @@ impl ObjectModel<Ruby> for VMObjectModel {
         RubyObjectAccess::from_objref(object).payload_addr()
     }
 
-    const IN_OBJECT_ADDRESS_OFFSET: isize = 0;
-
     fn get_size_when_copied(object: ObjectReference) -> usize {
         Self::get_current_size(object)
     }

Diff for: gc/mmtk/src/object_model.rs

@@ -75,8 +75,8 @@ impl PPPRegistry {
 
             probe!(mmtk_ruby, remove_dead_ppps_start, ppps.len());
             ppps.retain_mut(|obj| {
-                if obj.is_live::<Ruby>() {
-                    *obj = obj.get_forwarded_object::<Ruby>().unwrap_or(*obj);
+                if obj.is_live() {
+                    *obj = obj.get_forwarded_object().unwrap_or(*obj);
                     true
                 } else {
                     log::trace!("  PPP removed: {}", *obj);
@@ -97,7 +97,7 @@ impl PPPRegistry {
                 .expect("PPPRegistry::pinned_ppp_children should not have races during GC.");
             probe!(mmtk_ruby, unpin_ppp_children_start, pinned_ppps.len());
             for obj in pinned_ppps.drain(..) {
-                let unpinned = memory_manager::unpin_object::<Ruby>(obj);
+                let unpinned = memory_manager::unpin_object(obj);
                 debug_assert!(unpinned);
             }
             probe!(mmtk_ruby, unpin_ppp_children_end);
@@ -147,7 +147,7 @@ impl GCWork<Ruby> for PinPPPChildren {
             });
 
         for target_object in ppp_children {
-            if memory_manager::pin_object::<Ruby>(target_object) {
+            if memory_manager::pin_object(target_object) {
                 newly_pinned_ppp_children.push(target_object);
             }
         }

Diff for: gc/mmtk/src/ppp.rs

@@ -250,7 +250,7 @@ impl<F: RootsWorkFactory<RubySlot>> GCWork<Ruby> for ScanWbUnprotectedRoots<F> {
         let gc_tls = unsafe { GCThreadTLS::from_vwt_check(worker.tls) };
         VMScanning::collect_object_roots_in("wb_unprot_roots", gc_tls, &mut self.factory, || {
             for object in self.objects.iter().copied() {
-                if object.is_reachable::<Ruby>() {
+                if object.is_reachable() {
                     debug!(
                         "[wb_unprot_roots] Visiting WB-unprotected object (parent): {}",
                         object

Diff for: gc/mmtk/src/scanning.rs

@@ -1,4 +1,4 @@
-use std::sync::{Arc, Mutex};
+use std::sync::Mutex;
 
 use mmtk::{
     scheduler::{GCWork, GCWorker, WorkBucketStage},
@@ -7,10 +7,9 @@ use mmtk::{
 };
 
 use crate::{
-    abi::{st_table, GCThreadTLS, RubyObjectAccess},
+    abi::{GCThreadTLS, RubyObjectAccess},
     binding::MovedGIVTblEntry,
     upcalls,
-    utils::AfterAll,
     Ruby,
 };
 
@@ -202,7 +201,7 @@ impl GCWork<Ruby> for ProcessObjFreeCandidates {
         let mut new_candidates = Vec::new();
 
         for object in obj_free_candidates.iter().copied() {
-            if object.is_reachable::<Ruby>() {
+            if object.is_reachable() {
                 // Forward and add back to the candidate list.
                 let new_object = object.forward();
                 trace!(
@@ -230,7 +229,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>()).is_some(),
+                mmtk::memory_manager::is_mmtk_object(object.to_raw_address()).is_some(),
                 "{} is not an MMTk object",
                 object
             );
@@ -356,7 +355,7 @@ impl GCWork<Ruby> for UpdateWbUnprotectedObjectsList {
         debug!("Updating {} WB-unprotected objects", old_objects.len());
 
         for object in old_objects {
-            if object.is_reachable::<Ruby>() {
+            if object.is_reachable() {
                 // Forward and add back to the candidate list.
                 let new_object = object.forward();
                 trace!(
@@ -381,6 +380,6 @@ trait Forwardable {
 
 impl Forwardable for ObjectReference {
     fn forward(&self) -> Self {
-        self.get_forwarded_object::<Ruby>().unwrap_or(*self)
+        self.get_forwarded_object().unwrap_or(*self)
     }
 }