Update to mmtk-core PR #838 (#142)

This PR updates mmtk-core to mmtk/mmtk-core#838.

Author: qinsoon

mmtk/Cargo.lock

@@ -28,7 +28,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 = "de8bbfe623eee5e915f32870de8f81128df8ad41" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0" }
 # 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" }
 

mmtk/Cargo.toml

@@ -28,7 +28,7 @@ extern void* alloc_slow_largeobject(MMTk_Mutator mutator, size_t size,
     size_t align, size_t offset, int allocator);
 
 extern void post_alloc(MMTk_Mutator mutator, void* refer, void* type_refer,
-    int bytes, int allocator);
+    size_t bytes, int allocator);
 
 extern bool is_live_object(void* obj);
 extern bool is_mapped_object(void* obj);

mmtk/api/mmtk.h

@@ -91,7 +91,7 @@ pub extern "C" fn alloc(
     mutator: *mut Mutator<JikesRVM>,
     size: usize,
     align: usize,
-    offset: isize,
+    offset: usize,
     allocator: AllocationSemantics,
 ) -> Address {
     memory_manager::alloc::<JikesRVM>(unsafe { &mut *mutator }, size, align, offset, allocator)
@@ -298,7 +298,7 @@ pub extern "C" fn alloc_slow_bump_monotone_immortal(
     allocator: *mut c_void,
     size: usize,
     align: usize,
-    offset: isize,
+    offset: usize,
 ) -> Address {
     unsafe { &mut *(allocator as *mut BumpAllocator<JikesRVM>) }.alloc_slow(size, align, offset)
 }
@@ -312,7 +312,7 @@ pub extern "C" fn alloc_slow_bump_monotone_copy(
     allocator: *mut c_void,
     size: usize,
     align: usize,
-    offset: isize,
+    offset: usize,
 ) -> Address {
     unsafe { &mut *(allocator as *mut BumpAllocator<JikesRVM>) }.alloc_slow(size, align, offset)
 }
@@ -322,7 +322,7 @@ pub extern "C" fn alloc_slow_bump_monotone_copy(
     _allocator: *mut c_void,
     _size: usize,
     _align: usize,
-    _offset: isize,
+    _offset: usize,
 ) -> Address {
     unimplemented!()
 }
@@ -332,7 +332,7 @@ pub extern "C" fn alloc_slow_largeobject(
     allocator: *mut c_void,
     size: usize,
     align: usize,
-    offset: isize,
+    offset: usize,
 ) -> Address {
     unsafe { &mut *(allocator as *mut LargeObjectAllocator<JikesRVM>) }
         .alloc_slow(size, align, offset)

mmtk/src/api.rs

@@ -69,7 +69,7 @@ impl VMObjectModel {
     }
 
     #[allow(dead_code)]
-    pub(crate) fn get_align_offset_when_copied(object: ObjectReference) -> isize {
+    pub(crate) fn get_align_offset_when_copied(object: ObjectReference) -> usize {
         trace!("ObjectModel.get_align_offset_when_copied");
         let rvm_type = Self::load_rvm_type(object);
 
@@ -182,7 +182,7 @@ impl ObjectModel<JikesRVM> for VMObjectModel {
         }
     }
 
-    fn get_align_offset_when_copied(object: ObjectReference) -> isize {
+    fn get_align_offset_when_copied(object: ObjectReference) -> usize {
         let rvm_type = Self::load_rvm_type(object);
 
         if Self::is_class(rvm_type) {
@@ -490,33 +490,33 @@ impl VMObjectModel {
     }
 
     #[inline(always)]
-    fn get_offset_for_alignment_array(object: ObjectReference, _rvm_type: Address) -> isize {
+    fn get_offset_for_alignment_array(object: ObjectReference, _rvm_type: Address) -> usize {
         trace!("VMObjectModel.get_offset_for_alignment_array");
-        let mut offset = OBJECT_REF_OFFSET;
+        let mut offset = OBJECT_REF_OFFSET as usize;
 
         if ADDRESS_BASED_HASHING && !DYNAMIC_HASH_OFFSET {
             let hash_state = unsafe {
                 (object.to_raw_address() + STATUS_OFFSET).load::<usize>() & HASH_STATE_MASK
             };
             if hash_state != HASH_STATE_UNHASHED {
-                offset += HASHCODE_BYTES as isize;
+                offset += HASHCODE_BYTES;
             }
         }
 
         offset
     }
 
     #[inline(always)]
-    fn get_offset_for_alignment_class(object: ObjectReference, _rvm_type: Address) -> isize {
+    fn get_offset_for_alignment_class(object: ObjectReference, _rvm_type: Address) -> usize {
         trace!("VMObjectModel.get_offset_for_alignment_class");
-        let mut offset = SCALAR_HEADER_SIZE as isize;
+        let mut offset = SCALAR_HEADER_SIZE;
 
         if ADDRESS_BASED_HASHING && !DYNAMIC_HASH_OFFSET {
             let hash_state = unsafe {
                 (object.to_raw_address() + STATUS_OFFSET).load::<usize>() & HASH_STATE_MASK
             };
             if hash_state != HASH_STATE_UNHASHED {
-                offset += HASHCODE_BYTES as isize;
+                offset += HASHCODE_BYTES
             }
         }