Update mmtk-core, cargo fmt

Author: qinsoon

mmtk/Cargo.toml

@@ -20,16 +20,15 @@ openjdk_version = "67d5d2b16aacb2ea948552fab2323ebd0abbe924"
 [dependencies]
 libc = "0.2"
 lazy_static = "1.1"
-log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }
 # Be very careful to commit any changes to the following mmtk dependency, as our CI scripts (including mmtk-core CI)
 # rely on matching these lines to modify them: e.g. comment out the git dependency and use the local path.
 # These changes are safe:
 # - 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 = "dbd152b29ff54c3f028318e73ac182d681deda9a" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "63e1fdace31caf8494c612f56e0aced7af7eb644" }
 # Uncomment the following to build locally
-mmtk = { path = "/home/yilin/Code/mmtk-core" }
+# mmtk = { path = "../repos/mmtk-core" }
 
 [features]
 default = []

mmtk/src/abi.rs

@@ -151,12 +151,12 @@ pub struct InstanceKlass {
 #[derive(Copy, Clone, Debug)]
 #[allow(dead_code)]
 pub enum ReferenceType {
-    None,      // Regular class
-    Other,     // Subclass of java/lang/ref/Reference, but not subclass of one of the classes below
-    Soft,      // Subclass of java/lang/ref/SoftReference
-    Weak,      // Subclass of java/lang/ref/WeakReference
-    Final,     // Subclass of java/lang/ref/FinalReference
-    Phantom    // Subclass of java/lang/ref/PhantomReference
+    None,    // Regular class
+    Other,   // Subclass of java/lang/ref/Reference, but not subclass of one of the classes below
+    Soft,    // Subclass of java/lang/ref/SoftReference
+    Weak,    // Subclass of java/lang/ref/WeakReference
+    Final,   // Subclass of java/lang/ref/FinalReference
+    Phantom, // Subclass of java/lang/ref/PhantomReference
 }
 
 impl InstanceKlass {

mmtk/src/lib.rs

@@ -9,8 +9,6 @@ extern crate libc;
 extern crate mmtk;
 #[macro_use]
 extern crate lazy_static;
-#[macro_use]
-extern crate log;
 
 use std::ptr::null_mut;
 

mmtk/src/object_scanning.rs

@@ -111,18 +111,22 @@ impl OopIterate for TypeArrayKlass {
 impl OopIterate for InstanceRefKlass {
     #[inline]
     fn oop_iterate(&self, oop: Oop, closure: &mut impl TransitiveClosure) {
-        use crate::api::{add_weak_candidate, add_soft_candidate, add_phantom_candidate};
         use crate::abi::*;
+        use crate::api::{add_phantom_candidate, add_soft_candidate, add_weak_candidate};
         self.instance_klass.oop_iterate(oop, closure);
 
         let reference = ObjectReference::from(oop);
         let referent = unsafe { Self::referent_address(oop).load::<ObjectReference>() };
         match self.instance_klass.reference_type {
-            ReferenceType::None => panic!("oop_iterate on InstanceRefKlass with reference_type as None"),
+            ReferenceType::None => {
+                panic!("oop_iterate on InstanceRefKlass with reference_type as None")
+            }
             ReferenceType::Weak => add_weak_candidate(reference, referent),
             ReferenceType::Soft => add_soft_candidate(reference, referent),
             ReferenceType::Phantom => add_phantom_candidate(reference, referent),
-            _ => {
+            // Process these two types normally (as if they are strong refs)
+            // We will handle final reference later
+            ReferenceType::Final | ReferenceType::Other => {
                 let referent_addr = Self::referent_address(oop);
                 closure.process_edge(referent_addr);
                 let discovered_addr = Self::discovered_address(oop);

mmtk/src/reference_glue.rs

@@ -1,10 +1,8 @@
-use crate::OpenJDK;
 use crate::abi::{InstanceRefKlass, Oop};
-use mmtk::util::opaque_pointer::VMWorkerThread;
+use crate::OpenJDK;
+use crate::UPCALLS;
 use mmtk::util::ObjectReference;
 use mmtk::vm::ReferenceGlue;
-use mmtk::scheduler::ProcessEdgesWork;
-use crate::UPCALLS;
 
 pub struct VMReferenceGlue {}
 

openjdk/mmtkUpcalls.cpp

@@ -320,7 +320,7 @@ static void mmtk_prepare_for_roots_re_scanning() {
 }
 
 static void mmtk_enqueue_reference(void* object) {
-  printf("enqueue object: %p\n", object);
+  // printf("enqueue object: %p\n", object);
   MutexLocker x(Heap_lock);
   oop reff = (oop) object;
   oop old = Universe::swap_reference_pending_list(reff);