Merge branch 'master' into weak-ref

Author: qinsoon

mmtk/Cargo.toml

@@ -26,7 +26,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/mmtk/mmtk-core.git", rev = "a55db731e38618f2143a14b5152390dcc7ba4faf" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "4ba3ed2b9be7dc94bc02c04c00f225f3be2274ad" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/src/api.rs

@@ -163,8 +163,8 @@ pub extern "C" fn handle_user_collection_request(tls: VMMutatorThread) {
 }
 
 #[no_mangle]
-pub extern "C" fn is_mapped_object(object: ObjectReference) -> bool {
-    memory_manager::is_mapped_object(object)
+pub extern "C" fn is_in_mmtk_spaces(object: ObjectReference) -> bool {
+    memory_manager::is_in_mmtk_spaces(object)
 }
 
 #[no_mangle]

openjdk/mmtk.h

@@ -47,7 +47,7 @@ extern void record_modified_node(MMTk_Mutator mutator, void* obj);
 
 extern void release_buffer(void** buffer, size_t len, size_t cap);
 
-extern bool is_mapped_object(void* ref);
+extern bool is_in_mmtk_spaces(void* ref);
 extern bool is_mapped_address(void* addr);
 extern void modify_check(void* ref);
 

openjdk/mmtkHeap.cpp

@@ -186,7 +186,7 @@ bool MMTkHeap::is_in(const void* p) const {
   //return cp >= committed_low_addr() && cp < committed_high_addr();
 
   //guarantee(false, "is in not supported");
-  return is_mapped_object(const_cast<void *>(p));
+  return is_in_mmtk_spaces(const_cast<void *>(p));
 }
 
 bool MMTkHeap::is_in_reserved(const void* p) const {