Fix derived root pointers (#115)

Author: wenyuzhao

mmtk/Cargo.toml

@@ -20,7 +20,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 = "aec43e51c9dc737bd533f4db5106857b4ac19407" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "08cecbc080cc853383fa96f54436b8ca8026b130" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/src/scanning.rs

@@ -22,7 +22,7 @@ pub(crate) extern "C" fn create_process_edges_work<W: ProcessEdgesWork<VM = Open
         memory_manager::add_work_packet(
             &SINGLETON,
             WorkBucketStage::Closure,
-            W::new(buf, false, &SINGLETON),
+            W::new(buf, true, &SINGLETON),
         );
     }
     let (ptr, _, capacity) = Vec::with_capacity(W::CAPACITY).into_raw_parts();

openjdk/mmtkUpcalls.cpp

@@ -45,6 +45,12 @@ static size_t mmtk_start_the_world_count = 0;
 static void mmtk_stop_all_mutators(void *tls, void (*create_stack_scan_work)(void* mutator)) {
   MMTkHeap::_create_stack_scan_work = create_stack_scan_work;
 
+  ClassLoaderDataGraph::clear_claimed_marks();
+  CodeCache::gc_prologue();
+#if COMPILER2_OR_JVMCI
+  DerivedPointerTable::clear();
+#endif
+
   log_debug(gc)("Requesting the VM to suspend all mutators...");
   MMTkHeap::heap()->companion_thread()->request(MMTkVMCompanionThread::_threads_suspended, true);
   log_debug(gc)("Mutators stopped. Now enumerate threads for scanning...");
@@ -59,6 +65,13 @@ static void mmtk_stop_all_mutators(void *tls, void (*create_stack_scan_work)(voi
 }
 
 static void mmtk_resume_mutators(void *tls) {
+  ClassLoaderDataGraph::purge();
+  CodeCache::gc_epilogue();
+  JvmtiExport::gc_epilogue();
+#if COMPILER2_OR_JVMCI
+  DerivedPointerTable::update_pointers();
+#endif
+
   MMTkHeap::_create_stack_scan_work = NULL;
 
   log_debug(gc)("Requesting the VM to resume all mutators...");