diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index a437334..33a77e3 100644 --- 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 = "571a857b75e648ca4c711d56fbf400d99173398f" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "f0fed5fc01438162115120c7551d4eb96e888bc2" } # Uncomment the following and fix the path to mmtk-core to build locally # mmtk = { path = "../repos/mmtk-core" } diff --git a/mmtk/src/collection.rs b/mmtk/src/collection.rs index f0fdb95..edd7c68 100644 --- a/mmtk/src/collection.rs +++ b/mmtk/src/collection.rs @@ -1,7 +1,6 @@ -use mmtk::scheduler::ProcessEdgesWork; use mmtk::util::opaque_pointer::*; use mmtk::vm::{Collection, GCThreadContext}; -use mmtk::MutatorContext; +use mmtk::{Mutator, MutatorContext}; use UPCALLS; use V8; @@ -12,7 +11,10 @@ const GC_THREAD_KIND_WORKER: libc::c_int = 1; pub struct VMCollection {} impl Collection for VMCollection { - fn stop_all_mutators>(tls: VMWorkerThread) { + fn stop_all_mutators(tls: VMWorkerThread, _mutator_visitor: F) + where + F: FnMut(&'static mut Mutator), + { unsafe { ((*UPCALLS).stop_all_mutators)(tls); } diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs index a7d4e5d..2f110d8 100644 --- a/mmtk/src/scanning.rs +++ b/mmtk/src/scanning.rs @@ -1,7 +1,7 @@ -use mmtk::scheduler::ProcessEdgesWork; use mmtk::util::opaque_pointer::*; use mmtk::util::ObjectReference; use mmtk::vm::EdgeVisitor; +use mmtk::vm::RootsWorkFactory; use mmtk::vm::Scanning; use mmtk::Mutator; use V8; @@ -24,18 +24,19 @@ impl Scanning for VMScanning { unimplemented!() } - fn scan_thread_roots>() { + fn scan_thread_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory) { unimplemented!() } - fn scan_thread_root>( - _mutator: &'static mut Mutator, + fn scan_thread_root( _tls: VMWorkerThread, + _mutator: &'static mut Mutator, + _factory: impl RootsWorkFactory, ) { unimplemented!() } - fn scan_vm_specific_roots>() { + fn scan_vm_specific_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory) { unimplemented!() }