Update to MMTk core PR #949 (#240)

Updates to mmtk/mmtk-core#949. --------- Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>
mmtk · Oct 24, 2023 · 60a8357 · 60a8357
1 parent 2a6be16
commit 60a8357
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 29 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -32,7 +32,7 @@ memoffset = "0.9.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 = "06a2e5d9773c9f7a32a6afc1add9cef311432dbc" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

diff --git a/mmtk/src/active_plan.rs b/mmtk/src/active_plan.rs
@@ -4,7 +4,6 @@ use crate::UPCALLS;
 use mmtk::util::opaque_pointer::*;
 use mmtk::vm::ActivePlan;
 use mmtk::Mutator;
-use mmtk::Plan;
 use std::collections::VecDeque;
 use std::marker::PhantomData;
 
@@ -39,10 +38,6 @@ impl<'a, const COMPRESSED: bool> Iterator for OpenJDKMutatorIterator<'a, COMPRES
 pub struct VMActivePlan {}
 
 impl<const COMPRESSED: bool> ActivePlan<OpenJDK<COMPRESSED>> for VMActivePlan {
-    fn global() -> &'static dyn Plan<VM = OpenJDK<COMPRESSED>> {
-        crate::singleton::<COMPRESSED>().get_plan()
-    }
-
     fn is_mutator(tls: VMThread) -> bool {
         unsafe { ((*UPCALLS).is_mutator)(tls) }
     }

diff --git a/mmtk/src/api.rs b/mmtk/src/api.rs
@@ -299,11 +299,6 @@ pub extern "C" fn is_mapped_address(addr: Address) -> bool {
     memory_manager::is_mapped_address(addr)
 }
 
-#[no_mangle]
-pub extern "C" fn modify_check(object: ObjectReference) {
-    with_singleton!(|singleton| memory_manager::modify_check(singleton, object))
-}
-
 #[no_mangle]
 pub extern "C" fn add_weak_candidate(reff: ObjectReference) {
     with_singleton!(|singleton| memory_manager::add_weak_candidate(singleton, reff))

diff --git a/openjdk/mmtk.h b/openjdk/mmtk.h
@@ -68,7 +68,6 @@ extern void release_buffer(void** buffer, size_t len, size_t cap);
 
 extern bool is_in_mmtk_spaces(void* ref);
 extern bool is_mapped_address(void* addr);
-extern void modify_check(void* ref);
 
 // This type declaration needs to match AllocatorSelector in mmtk-core
 struct AllocatorSelector {

diff --git a/openjdk/mmtkMutator.hpp b/openjdk/mmtkMutator.hpp
@@ -33,21 +33,21 @@ struct BumpAllocator {
   void* cursor;
   void* limit;
   RustDynPtr space;
-  RustDynPtr plan;
+  void* context;
 };
 
 struct LargeObjectAllocator {
   void* tls;
   void* space;
-  RustDynPtr plan;
+  void* context;
 };
 
 struct ImmixAllocator {
   void* tls;
   void* cursor;
   void* limit;
   void* immix_space;
-  RustDynPtr plan;
+  void* context;
   uint8_t hot;
   uint8_t copy;
   void* large_cursor;
@@ -72,7 +72,7 @@ struct FLBlockList {
 struct FreeListAllocator {
   void* tls;
   void* space;
-  RustDynPtr plan;
+  void* context;
   FLBlockList* available_blocks;
   FLBlockList* available_blocks_stress;
   FLBlockList* unswept_blocks;
@@ -82,7 +82,7 @@ struct FreeListAllocator {
 struct MallocAllocator {
   void* tls;
   void* space;
-  RustDynPtr plan;
+  void* context;
 };
 
 struct MarkCompactAllocator {