update with mmtk/mmtk-core#997 PR

fepicture · Oct 24, 2023 · 51633c7 · 51633c7
1 parent f06cd4f
commit 51633c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -28,7 +28,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
 # - change branch/rev
 # - 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 = "57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "b4f45195e09e38c6deae8605c0f61eb0b534ff20" }
 # Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
 # mmtk = { path = "../repos/mmtk-core" }
 

diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs
@@ -21,6 +21,7 @@ use mmtk::vm::ActivePlan;
 use mmtk::vm::EdgeVisitor;
 use mmtk::vm::RootsWorkFactory;
 use mmtk::vm::Scanning;
+use mmtk::MMTK;
 use mmtk::*;
 use object_model::VMObjectModel;
 use std::mem;
@@ -227,7 +228,7 @@ where
         .generational()
         .map_or(false, |plan| plan.is_current_gc_nursery());
 
-    let need_retain = SINGLETON.get_plan().is_emergency_collection();
+    let need_retain = SINGLETON.is_emergency_collection();
 
     tracer_context.with_tracer(worker, |tracer| unsafe {
         let scan_result = jtoc_call!(