Update to MMTk core PR #949

mmtk · Oct 19, 2023 · c62d2d4 · c62d2d4
1 parent c2c037b
commit c62d2d4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -27,7 +27,7 @@ log = "*"
 # - 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 = "61d20e2dcd5b4743ef04a8118eb807bcd6f6e2e2" }
+mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "d5f5ac9ee285b871c1985146b75e6aaa5619ded4" }
 # Uncomment the following and fix the path to mmtk-core to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

diff --git a/mmtk/src/active_plan.rs b/mmtk/src/active_plan.rs
@@ -2,18 +2,12 @@ use super::UPCALLS;
 use mmtk::util::opaque_pointer::*;
 use mmtk::vm::ActivePlan;
 use mmtk::Mutator;
-use mmtk::Plan;
 use std::sync::Mutex;
-use SINGLETON;
 use V8;
 
 pub struct VMActivePlan {}
 
 impl ActivePlan<V8> for VMActivePlan {
-    fn global() -> &'static dyn Plan<VM = V8> {
-        SINGLETON.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
@@ -162,11 +162,6 @@ pub extern "C" fn is_mapped_address(address: Address) -> bool {
     memory_manager::is_mapped_address(address)
 }
 
-#[no_mangle]
-pub extern "C" fn modify_check(mmtk: &mut MMTK<V8>, object: ObjectReference) {
-    memory_manager::modify_check(mmtk, object);
-}
-
 #[no_mangle]
 pub extern "C" fn handle_user_collection_request(mmtk: &mut MMTK<V8>, tls: VMMutatorThread) {
     memory_manager::handle_user_collection_request::<V8>(mmtk, tls);

diff --git a/v8/third_party/heap/mmtk/mmtk.h b/v8/third_party/heap/mmtk/mmtk.h
@@ -37,7 +37,6 @@ extern void post_alloc(MMTk_Mutator mutator, void* refer,
 extern bool is_live_object(void* ref);
 extern bool is_in_mmtk_spaces(void* ref);
 extern bool is_mapped_address(void* addr);
-extern void modify_check(void *mmtk, void* ref);
 extern bool is_in_read_only_space(void* addr);
 extern bool is_in_code_space(void* addr);