Require ObjectReference to point inside object (mmtk#173)

This makes changes for upstream API changes.

Upstream PR: mmtk/mmtk-core#1195

---------

Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>

Author: 2 people

mmtk/Cargo.lock

@@ -31,7 +31,7 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI
-mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "107c5a5b69907dcf00f09a80317e7f423d10d9bc" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "45cdf31055b1b6a629bdb8032adaa6dd5a8e32b9" }
 # Uncomment the following to build locally
 # mmtk = { path = "../../mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

mmtk/Cargo.toml

@@ -231,7 +231,7 @@ pub extern "C" fn mmtk_post_alloc(
 
 #[no_mangle]
 pub extern "C" fn mmtk_will_never_move(object: ObjectReference) -> bool {
-    !object.is_movable::<JuliaVM>()
+    !object.is_movable()
 }
 
 #[no_mangle]
@@ -262,7 +262,7 @@ pub extern "C" fn mmtk_total_bytes() -> usize {
 
 #[no_mangle]
 pub extern "C" fn mmtk_is_live_object(object: ObjectReference) -> bool {
-    object.is_live::<JuliaVM>()
+    object.is_live()
 }
 
 #[no_mangle]
@@ -497,7 +497,7 @@ pub extern "C" fn mmtk_pin_object(object: ObjectReference) -> bool {
     crate::early_return_for_non_moving!(false);
 
     if mmtk_object_is_managed_by_mmtk(object.to_raw_address().as_usize()) {
-        memory_manager::pin_object::<JuliaVM>(object)
+        memory_manager::pin_object(object)
     } else {
         warn!("Object is not managed by mmtk - (un)pinning it via this function isn't supported.");
         false
@@ -509,7 +509,7 @@ pub extern "C" fn mmtk_unpin_object(object: ObjectReference) -> bool {
     crate::early_return_for_non_moving!(false);
 
     if mmtk_object_is_managed_by_mmtk(object.to_raw_address().as_usize()) {
-        memory_manager::unpin_object::<JuliaVM>(object)
+        memory_manager::unpin_object(object)
     } else {
         warn!("Object is not managed by mmtk - (un)pinning it via this function isn't supported.");
         false
@@ -521,7 +521,7 @@ pub extern "C" fn mmtk_is_pinned(object: ObjectReference) -> bool {
     crate::early_return_for_non_moving!(false);
 
     if mmtk_object_is_managed_by_mmtk(object.to_raw_address().as_usize()) {
-        memory_manager::is_pinned::<JuliaVM>(object)
+        memory_manager::is_pinned(object)
     } else {
         warn!("Object is not managed by mmtk - checking via this function isn't supported.");
         false

mmtk/src/api.rs

@@ -1,5 +1,4 @@
 use crate::julia_types::*;
-use crate::JuliaVM;
 use crate::UPCALLS;
 
 use mmtk::memory_manager;
@@ -17,7 +16,7 @@ pub fn pin_conservative_roots() {
 
     let mut roots = CONSERVATIVE_ROOTS.lock().unwrap();
     let n_roots = roots.len();
-    roots.retain(|obj| mmtk::memory_manager::pin_object::<JuliaVM>(*obj));
+    roots.retain(|obj| mmtk::memory_manager::pin_object(*obj));
     let n_pinned = roots.len();
     log::debug!("Conservative roots: {}, pinned: {}", n_roots, n_pinned);
 }
@@ -29,9 +28,9 @@ pub fn unpin_conservative_roots() {
     let n_pinned = roots.len();
     let mut n_live = 0;
     roots.drain().for_each(|obj| {
-        if mmtk::memory_manager::is_live_object::<JuliaVM>(obj) {
+        if mmtk::memory_manager::is_live_object(obj) {
             n_live += 1;
-            mmtk::memory_manager::unpin_object::<JuliaVM>(obj);
+            mmtk::memory_manager::unpin_object(obj);
         }
     });
     log::debug!(
@@ -114,7 +113,7 @@ fn conservative_scan_range(lo: Address, hi: Address) {
 fn is_potential_mmtk_object(addr: Address) -> Option<ObjectReference> {
     if crate::object_model::is_addr_in_immixspace(addr) {
         // We only care about immix space. If the object is in other spaces, we won't move them, and we don't need to pin them.
-        memory_manager::find_object_from_internal_pointer::<JuliaVM>(addr, usize::MAX)
+        memory_manager::find_object_from_internal_pointer(addr, usize::MAX)
     } else {
         None
     }

mmtk/src/conservative.rs

@@ -149,12 +149,12 @@ fn sweep_finalizer_list(
         let (isfreed, isold) = if gc_ptr_tag(v0, 2) {
             (true, false)
         } else {
-            let isfreed = !memory_manager::is_live_object::<JuliaVM>(v);
+            let isfreed = !memory_manager::is_live_object(v);
             debug_assert!(!fin.is_zero());
             let isold = finalizer_list_marked.is_some()
                 && !isfreed
                 && (mmtk_object_is_managed_by_mmtk(fin.as_usize())
-                    && memory_manager::is_live_object::<JuliaVM>(unsafe {
+                    && memory_manager::is_live_object(unsafe {
                         ObjectReference::from_raw_address_unchecked(fin)
                     })
                     || !(mmtk_object_is_managed_by_mmtk(fin.as_usize())));

mmtk/src/julia_finalizer.rs

@@ -4,7 +4,6 @@ use crate::julia_types::*;
 use crate::object_model::mmtk_jl_array_ndims;
 use crate::slots::JuliaVMSlot;
 use crate::slots::OffsetSlot;
-use crate::JuliaVM;
 use crate::JULIA_BUFF_TAG;
 use crate::UPCALLS;
 use memoffset::offset_of;
@@ -560,7 +559,7 @@ pub fn process_slot<EV: SlotVisitor<JuliaVMSlot>>(closure: &mut EV, slot: Addres
 
         if let Some(objref) = simple_slot.load() {
             debug_assert!(
-                mmtk::memory_manager::is_in_mmtk_spaces::<JuliaVM>(objref),
+                mmtk::memory_manager::is_in_mmtk_spaces(objref),
                 "Object {:?} in slot {:?} is not mapped address",
                 objref,
                 simple_slot
@@ -631,7 +630,7 @@ pub fn process_offset_slot<EV: SlotVisitor<JuliaVMSlot>>(
 
         if let Some(objref) = offset_slot.load() {
             debug_assert!(
-                mmtk::memory_manager::is_in_mmtk_spaces::<JuliaVM>(objref),
+                mmtk::memory_manager::is_in_mmtk_spaces(objref),
                 "Object {:?} in slot {:?} is not mapped address",
                 objref,
                 offset_slot

mmtk/src/julia_scanning.rs

@@ -168,8 +168,6 @@ impl ObjectModel<JuliaVM> for VMObjectModel {
         object.to_raw_address()
     }
 
-    const IN_OBJECT_ADDRESS_OFFSET: isize = 0;
-
     fn dump_object(_object: ObjectReference) {
         unimplemented!()
     }

mmtk/src/object_model.rs

@@ -1,5 +1,4 @@
 use crate::api::MMTK_SIDE_VO_BIT_BASE_ADDRESS;
-use crate::JuliaVM;
 use core::sync::atomic::Ordering;
 use enum_map::Enum;
 use mmtk::util::Address;
@@ -151,7 +150,7 @@ pub extern "C" fn mmtk_julia_copy_stack_check(c_flag_is_defined: bool) {
 
 #[no_mangle]
 pub extern "C" fn mmtk_get_possibly_forwared(object: ObjectReference) -> ObjectReference {
-    match object.get_forwarded_object::<JuliaVM>() {
+    match object.get_forwarded_object() {
         Some(forwarded) => forwarded,
         None => object,
     }