Update to MMTk core PR #949

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="61d20e2dcd5b4743ef04a8118eb807bcd6f6e2e2" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev="57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

mmtk/api/mmtk.h

@@ -44,7 +44,6 @@ extern void mmtk_post_alloc(MMTk_Mutator mutator, void* refer,
 extern bool mmtk_is_live_object(void* ref);
 extern bool mmtk_is_mapped_object(void* ref);
 extern bool mmtk_is_mapped_address(void* addr);
-extern void mmtk_modify_check(void* ref);
 extern int mmtk_object_is_managed_by_mmtk(void* addr);
 extern void mmtk_runtime_panic(void);
 extern void mmtk_unreachable(void);

mmtk/api/mmtkMutator.h

@@ -1,6 +1,9 @@
 #ifndef MMTK_JULIA_MMTK_MUTATOR_H
 #define MMTK_JULIA_MMTK_MUTATOR_H
 
+// mmtk_julia_types.h refers to the types in this file.
+// So if this file is updated, make sure you regenerate Rust types for mmtk_julia_types.h.
+
 enum Allocator {
   AllocatorDefault = 0,
   AllocatorImmortal = 1,
@@ -29,21 +32,21 @@ typedef struct {
   void* cursor;
   void* limit;
   RustDynPtr space;
-  RustDynPtr plan;
+  void* context;
 } BumpAllocator;
 
 typedef struct {
   void* tls;
   void* space;
-  RustDynPtr plan;
+  void* context;
 } LargeObjectAllocator;
 
 typedef struct {
   void* tls;
   void* cursor;
   void* limit;
   void* immix_space;
-  RustDynPtr plan;
+  void* context;
   uint8_t hot;
   uint8_t copy;
   void* large_cursor;
@@ -68,7 +71,7 @@ typedef struct {
 typedef struct {
   void* tls;
   void* space;
-  RustDynPtr plan;
+  void* context;
   FLBlockList* available_blocks;
   FLBlockList* available_blocks_stress;
   FLBlockList* unswept_blocks;
@@ -78,7 +81,7 @@ typedef struct {
 typedef struct {
   void* tls;
   void* space;
-  RustDynPtr plan;
+  void* context;
 } MMTkMallocAllocator; // Prefix with MMTk to avoid name clash
 
 typedef struct {

mmtk/src/active_plan.rs

@@ -1,10 +1,9 @@
 use crate::JuliaVM;
-use crate::{MUTATORS, SINGLETON};
+use crate::MUTATORS;
 use mmtk::util::opaque_pointer::*;
 use mmtk::util::Address;
 use mmtk::vm::ActivePlan;
 use mmtk::Mutator;
-use mmtk::Plan;
 use mmtk::{plan::ObjectQueue, scheduler::GCWorker, util::ObjectReference};
 
 use std::collections::HashMap;
@@ -44,10 +43,6 @@ impl<'a> Iterator for JuliaMutatorIterator<'a> {
 pub struct VMActivePlan {}
 
 impl ActivePlan<JuliaVM> for VMActivePlan {
-    fn global() -> &'static dyn Plan<VM = JuliaVM> {
-        SINGLETON.get_plan()
-    }
-
     fn number_of_mutators() -> usize {
         Self::mutators().count()
     }

mmtk/src/api.rs

@@ -289,11 +289,6 @@ pub extern "C" fn mmtk_is_mapped_address(address: Address) -> bool {
     address.is_mapped()
 }
 
-#[no_mangle]
-pub extern "C" fn mmtk_modify_check(object: ObjectReference) {
-    memory_manager::modify_check(&SINGLETON, object)
-}
-
 #[no_mangle]
 pub extern "C" fn mmtk_handle_user_collection_request(tls: VMMutatorThread, collection: u8) {
     AtomicIsize::fetch_add(&USER_TRIGGERED_GC, 1, Ordering::SeqCst);
@@ -306,13 +301,9 @@ pub extern "C" fn mmtk_handle_user_collection_request(tls: VMMutatorThread, coll
         // auto
         0 => memory_manager::handle_user_collection_request::<JuliaVM>(&SINGLETON, tls),
         // full
-        1 => SINGLETON
-            .get_plan()
-            .handle_user_collection_request(tls, true, true),
+        1 => SINGLETON.handle_user_collection_request(tls, true, true),
         // incremental
-        2 => SINGLETON
-            .get_plan()
-            .handle_user_collection_request(tls, true, false),
+        2 => SINGLETON.handle_user_collection_request(tls, true, false),
         _ => unreachable!(),
     }
 }