diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index e1a285e..a46bb88 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -424,8 +424,8 @@ dependencies = [ [[package]] name = "mmtk" -version = "0.24.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=a02803b4104519ff2289234101a2dd8ceedd1bc7#a02803b4104519ff2289234101a2dd8ceedd1bc7" +version = "0.25.0" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=56b2521d2b99848ee0613a0a5288fe6d81b754ba#56b2521d2b99848ee0613a0a5288fe6d81b754ba" dependencies = [ "atomic", "atomic-traits", @@ -459,8 +459,8 @@ dependencies = [ [[package]] name = "mmtk-macros" -version = "0.24.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=a02803b4104519ff2289234101a2dd8ceedd1bc7#a02803b4104519ff2289234101a2dd8ceedd1bc7" +version = "0.25.0" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=56b2521d2b99848ee0613a0a5288fe6d81b754ba#56b2521d2b99848ee0613a0a5288fe6d81b754ba" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index face613..11a771a 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 = "a02803b4104519ff2289234101a2dd8ceedd1bc7" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "56b2521d2b99848ee0613a0a5288fe6d81b754ba" } # Uncomment the following and fix the path to mmtk-core to build locally # mmtk = { path = "../repos/mmtk-core" } diff --git a/mmtk/src/lib.rs b/mmtk/src/lib.rs index 546091d..d874466 100644 --- a/mmtk/src/lib.rs +++ b/mmtk/src/lib.rs @@ -51,7 +51,7 @@ pub struct V8; /// /// TODO: We start with Address to transition from the old API. /// We should define an edge type suitable for V8. -pub type V8Edge = Address; +pub type V8Slot = Address; impl VMBinding for V8 { type VMObjectModel = object_model::VMObjectModel; @@ -60,8 +60,8 @@ impl VMBinding for V8 { type VMActivePlan = active_plan::VMActivePlan; type VMReferenceGlue = reference_glue::VMReferenceGlue; - type VMEdge = V8Edge; - type VMMemorySlice = mmtk::vm::edge_shape::UnimplementedMemorySlice; + type VMSlot = V8Slot; + type VMMemorySlice = mmtk::vm::slot::UnimplementedMemorySlice; const MAX_ALIGNMENT: usize = 32; } diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs index bdcd55a..8eb3cdf 100644 --- a/mmtk/src/scanning.rs +++ b/mmtk/src/scanning.rs @@ -1,16 +1,16 @@ use mmtk::util::opaque_pointer::*; use mmtk::util::ObjectReference; -use mmtk::vm::EdgeVisitor; use mmtk::vm::RootsWorkFactory; use mmtk::vm::Scanning; +use mmtk::vm::SlotVisitor; use mmtk::Mutator; -use V8Edge; +use V8Slot; use V8; pub struct VMScanning {} impl Scanning for VMScanning { - fn scan_object>( + fn scan_object>( _tls: VMWorkerThread, _object: ObjectReference, _edge_visitor: &mut EV, @@ -25,12 +25,12 @@ impl Scanning for VMScanning { fn scan_roots_in_mutator_thread( _tls: VMWorkerThread, _mutator: &'static mut Mutator, - _factory: impl RootsWorkFactory, + _factory: impl RootsWorkFactory, ) { unimplemented!() } - fn scan_vm_specific_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory) { + fn scan_vm_specific_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory) { unimplemented!() }