Update after binding api change

wenyuzhao · wenyuzhao · commit d0d7eea78be2 · 2020-10-29T14:59:43.000+11:00
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -21,9 +21,9 @@ 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 = "ssh://git@github.com/mmtk/mmtk-core.git", rev = "013e2fe2118118376cf6778dd3894399a6abf53f" }
+mmtk = { git = "ssh://git@github.com/mmtk/mmtk-core.git", rev = "6775fde2e8aea0752240d976bc957dbfbe9b5981" }
 # Uncomment the following to build locally
-mmtk = { path = "../repos/mmtk-core" }
+# mmtk = { path = "../repos/mmtk-core" }
 
 [features]
 default = []
diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs
@@ -54,7 +54,7 @@ impl Scanning<OpenJDK> for VMScanning {
         }
     }
 
-    fn scan_thread_root<W: ProcessEdgesWork<VM=OpenJDK>>(mutator: &'static mut Mutator<SelectedPlan<OpenJDK>>) {
+    fn scan_thread_root<W: ProcessEdgesWork<VM=OpenJDK>>(mutator: &'static mut Mutator<SelectedPlan<OpenJDK>>, _tls: OpaquePointer) {
         let tls = mutator.get_tls();
         let process_edges = create_process_edges_work::<W>;
         unsafe {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ impl Scanning<OpenJDK> for VMScanning {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- fn scan_thread_root<W: ProcessEdgesWork<VM=OpenJDK>>(mutator: &'static mut Mutator<SelectedPlan<OpenJDK>>) {`
	`57`	`+ fn scan_thread_root<W: ProcessEdgesWork<VM=OpenJDK>>(mutator: &'static mut Mutator<SelectedPlan<OpenJDK>>, _tls: OpaquePointer) {`
`58`	`58`	`let tls = mutator.get_tls();`
`59`	`59`	`let process_edges = create_process_edges_work::<W>;`
`60`	`60`	`unsafe {`