Update to mmtk-core PR #161 (#28)

Author: qinsoon

mmtk/Cargo.toml

@@ -21,7 +21,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 = "ssh://[email protected]/mmtk/mmtk-core.git", rev = "b9dc15173c881861644f8f48d7abf2e1fc6b4fc7" }
+mmtk = { git = "ssh://[email protected]/mmtk/mmtk-core.git", rev = "aa518f13e04441ef6f344c88fe7f7464e6a3a73a" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/src/api.rs

@@ -3,7 +3,7 @@ use libc::{c_char, c_void};
 use std::ffi::CStr;
 
 use mmtk::memory_manager;
-use mmtk::Allocator;
+use mmtk::AllocationSemantics;
 use mmtk::util::{ObjectReference, OpaquePointer, Address};
 use mmtk::{Plan, MMTK};
 use mmtk::util::constants::LOG_BYTES_IN_PAGE;
@@ -52,12 +52,12 @@ pub extern "C" fn flush_mutator(mutator: *mut Mutator<SelectedPlan<OpenJDK>>) {
 
 #[no_mangle]
 pub extern "C" fn alloc(mutator: *mut Mutator<SelectedPlan<OpenJDK>>, size: usize,
-                    align: usize, offset: isize, allocator: Allocator) -> Address {
+                    align: usize, offset: isize, allocator: AllocationSemantics) -> Address {
     memory_manager::alloc::<OpenJDK>(unsafe { &mut *mutator }, size, align, offset, allocator)
 }
 
 #[no_mangle]
-pub extern "C" fn get_allocator_mapping(allocator: Allocator) -> AllocatorSelector {
+pub extern "C" fn get_allocator_mapping(allocator: AllocationSemantics) -> AllocatorSelector {
     memory_manager::get_allocator_mapping(&SINGLETON, allocator)
 }
 
@@ -95,7 +95,7 @@ pub extern "C" fn alloc_slow_largeobject(allocator: *mut c_void, size: usize, al
 
 #[no_mangle]
 pub extern "C" fn post_alloc(mutator: *mut Mutator<SelectedPlan<OpenJDK>>, refer: ObjectReference, type_refer: ObjectReference,
-                                        bytes: usize, allocator: Allocator) {
+                                        bytes: usize, allocator: AllocationSemantics) {
     memory_manager::post_alloc::<OpenJDK>(unsafe { &mut *mutator }, refer, type_refer, bytes, allocator)
 }
 

mmtk/src/object_model.rs

@@ -1,6 +1,6 @@
 
 use mmtk::vm::*;
-use mmtk::Allocator;
+use mmtk::AllocationSemantics;
 use mmtk::util::{Address, ObjectReference};
 use mmtk::util::OpaquePointer;
 use std::sync::atomic::{AtomicU8, AtomicUsize, Ordering};
@@ -21,7 +21,7 @@ impl ObjectModel<OpenJDK> for VMObjectModel {
         }
     }
     #[inline]
-    fn copy(from: ObjectReference, allocator: Allocator, copy_context: &mut impl CopyContext) -> ObjectReference {
+    fn copy(from: ObjectReference, allocator: AllocationSemantics, copy_context: &mut impl CopyContext) -> ObjectReference {
         let bytes = unsafe { ((*UPCALLS).get_object_size)(from) };
         let dst = copy_context.alloc_copy(from, bytes, ::std::mem::size_of::<usize>(), 0, allocator);
         // Copy