Use to_address for SFT access

Upstream change: mmtk/mmtk-core#1122

Author: wks

mmtk/Cargo.lock

@@ -36,8 +36,8 @@ probe = "0.5"
 features = ["is_mmtk_object", "object_pinning"]
 
 # Uncomment the following lines to use mmtk-core from the official repository.
-git = "https://github.com/mmtk/mmtk-core.git"
-rev = "d291cda52790a34ed10bf72b4c5e27c3ab89a242"
+git = "https://github.com/wks/mmtk-core.git"
+rev = "20e56c25713fc42ec6747f9a38d9c7f4fa820f12"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 #path = "../../mmtk-core"

mmtk/Cargo.toml

@@ -148,7 +148,7 @@ pub extern "C" fn mmtk_post_alloc(
 
 #[no_mangle]
 pub extern "C" fn mmtk_will_never_move(object: ObjectReference) -> bool {
-    !object.is_movable()
+    !object.is_movable::<Ruby>()
 }
 
 #[no_mangle]
@@ -199,18 +199,18 @@ pub extern "C" fn mmtk_total_bytes() -> usize {
 
 #[no_mangle]
 pub extern "C" fn mmtk_is_reachable(object: ObjectReference) -> bool {
-    object.is_reachable()
+    object.is_reachable::<Ruby>()
 }
 
 #[no_mangle]
 pub extern "C" fn mmtk_is_live_object(object: ObjectReference) -> bool {
-    memory_manager::is_live_object(object)
+    memory_manager::is_live_object::<Ruby>(object)
 }
 
 #[no_mangle]
 pub extern "C" fn mmtk_get_forwarded_object(object: ObjectReference) -> ObjectReference {
     object
-        .get_forwarded_object()
+        .get_forwarded_object::<Ruby>()
         .unwrap_or(ObjectReference::NULL)
 }
 

mmtk/src/api.rs

@@ -70,8 +70,8 @@ impl PPPRegistry {
 
             probe!(mmtk_ruby, remove_dead_ppps_start, ppps.len());
             ppps.retain_mut(|obj| {
-                if obj.is_live() {
-                    *obj = obj.get_forwarded_object().unwrap_or(*obj);
+                if obj.is_live::<Ruby>() {
+                    *obj = obj.get_forwarded_object::<Ruby>().unwrap_or(*obj);
                     true
                 } else {
                     log::trace!("  PPP removed: {}", *obj);

mmtk/src/ppp.rs

@@ -122,7 +122,7 @@ impl GCWork<Ruby> for ProcessObjFreeCandidates {
         let mut new_candidates = Vec::new();
 
         for object in obj_free_candidates.iter().copied() {
-            if object.is_reachable() {
+            if object.is_reachable::<Ruby>() {
                 // Forward and add back to the candidate list.
                 let new_object = object.forward();
                 trace!(
@@ -216,6 +216,6 @@ trait Forwardable {
 
 impl Forwardable for ObjectReference {
     fn forward(&self) -> Self {
-        self.get_forwarded_object().unwrap_or(*self)
+        self.get_forwarded_object::<Ruby>().unwrap_or(*self)
     }
 }