Update to mmtk-core PR#647

mmtk/Cargo.toml

@@ -29,7 +29,7 @@ once_cell = "1.10.0"
 # - 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 = "76131c493be38e421f5fb157f9900f850584554f" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "4ae23b1dc0e14f62c196c12c93818e00e9de7cc5" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/src/object_model.rs

@@ -1,18 +1,14 @@
-use std::sync::atomic::Ordering;
-
 use super::UPCALLS;
 use crate::abi::Oop;
 use crate::{vm_metadata, OpenJDK};
 use mmtk::util::alloc::fill_alignment_gap;
 use mmtk::util::copy::*;
-use mmtk::util::metadata::header_metadata::HeaderMetadataSpec;
 use mmtk::util::{Address, ObjectReference};
 use mmtk::vm::*;
 
 pub struct VMObjectModel {}
 
 impl ObjectModel<OpenJDK> for VMObjectModel {
-    // For now we use the default const from mmtk-core
     const GLOBAL_LOG_BIT_SPEC: VMGlobalLogBitSpec = vm_metadata::LOGGING_SIDE_METADATA_SPEC;
 
     const LOCAL_FORWARDING_POINTER_SPEC: VMLocalForwardingPointerSpec =
@@ -22,68 +18,6 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
     const LOCAL_MARK_BIT_SPEC: VMLocalMarkBitSpec = vm_metadata::MARKING_METADATA_SPEC;
     const LOCAL_LOS_MARK_NURSERY_SPEC: VMLocalLOSMarkNurserySpec = vm_metadata::LOS_METADATA_SPEC;
 
-    #[inline(always)]
-    fn load_metadata(
-        metadata_spec: &HeaderMetadataSpec,
-        object: ObjectReference,
-        mask: Option<usize>,
-        atomic_ordering: Option<Ordering>,
-    ) -> usize {
-        vm_metadata::load_metadata(metadata_spec, object, mask, atomic_ordering)
-    }
-
-    #[inline(always)]
-    fn store_metadata(
-        metadata_spec: &HeaderMetadataSpec,
-        object: ObjectReference,
-        val: usize,
-        mask: Option<usize>,
-        atomic_ordering: Option<Ordering>,
-    ) {
-        vm_metadata::store_metadata(metadata_spec, object, val, mask, atomic_ordering);
-    }
-
-    #[inline(always)]
-    fn compare_exchange_metadata(
-        metadata_spec: &HeaderMetadataSpec,
-        object: ObjectReference,
-        old_val: usize,
-        new_val: usize,
-        mask: Option<usize>,
-        success_order: Ordering,
-        failure_order: Ordering,
-    ) -> bool {
-        vm_metadata::compare_exchange_metadata(
-            metadata_spec,
-            object,
-            old_val,
-            new_val,
-            mask,
-            success_order,
-            failure_order,
-        )
-    }
-
-    #[inline(always)]
-    fn fetch_add_metadata(
-        metadata_spec: &HeaderMetadataSpec,
-        object: ObjectReference,
-        val: usize,
-        order: Ordering,
-    ) -> usize {
-        vm_metadata::fetch_add_metadata(metadata_spec, object, val, order)
-    }
-
-    #[inline(always)]
-    fn fetch_sub_metadata(
-        metadata_spec: &HeaderMetadataSpec,
-        object: ObjectReference,
-        val: usize,
-        order: Ordering,
-    ) -> usize {
-        vm_metadata::fetch_sub_metadata(metadata_spec, object, val, order)
-    }
-
     #[inline]
     fn copy(
         from: ObjectReference,

mmtk/src/vm_metadata/constants.rs

@@ -3,7 +3,7 @@ use mmtk::vm::*;
 #[cfg(target_pointer_width = "64")]
 pub(crate) const FORWARDING_BITS_OFFSET: isize = 56;
 #[cfg(target_pointer_width = "32")]
-pub(crate) const FORWARDING_BITS_OFFSET: isize = 0;
+pub(crate) const FORWARDING_BITS_OFFSET: isize = unimplemenged!();
 
 pub(crate) const FORWARDING_POINTER_OFFSET: isize = 0;
 

mmtk/src/vm_metadata/mod.rs

@@ -1,5 +1,3 @@
 mod constants;
-mod global;
 
 pub(crate) use self::constants::*;
-pub(crate) use self::global::*;