Update to MMTk core PR #875

mmtk · Aug 3, 2023 · 62e12bc · 62e12bc
1 parent db49af4
commit 62e12bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -31,7 +31,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 = "47ee126f91f25b911498b3d49c35f672f5e935f9" }
+mmtk = { git = "https://github.com/qinsoon/mmtk-core.git", rev = "eda3e695a03a669f3a7ba34e7e1d4871dbc4f473" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

diff --git a/mmtk/src/collection.rs b/mmtk/src/collection.rs
@@ -133,13 +133,6 @@ impl Collection<JuliaVM> for VMCollection {
         unsafe { ((*UPCALLS).jl_throw_out_of_memory_error)() };
     }
 
-    fn prepare_mutator<T: MutatorContext<JuliaVM>>(
-        _tls_w: VMWorkerThread,
-        _tls_m: VMMutatorThread,
-        _mutator: &T,
-    ) {
-    }
-
     fn vm_live_bytes() -> usize {
         crate::api::JULIA_MALLOC_BYTES.load(Ordering::SeqCst)
     }

diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs
@@ -20,19 +20,11 @@ use std::sync::MutexGuard;
 pub struct VMScanning {}
 
 impl Scanning<JuliaVM> for VMScanning {
-    fn scan_roots_in_all_mutator_threads(
-        _tls: VMWorkerThread,
-        _factory: impl RootsWorkFactory<JuliaVMEdge>,
-    ) {
-        // Thread roots are collected by Julia before stopping the world
-    }
-
     fn scan_roots_in_mutator_thread(
         _tls: VMWorkerThread,
         _mutator: &'static mut Mutator<JuliaVM>,
         _factory: impl RootsWorkFactory<JuliaVMEdge>,
     ) {
-        unimplemented!()
     }
     fn scan_vm_specific_roots(
         _tls: VMWorkerThread,