Bump version to v0.24 (#271)

qinsoon · mmtkgc-bot · web-flow · commit de2ccb027b5b · 2024-04-08T20:54:31.000+12:00
Co-authored-by: mmtkgc-bot &lt;mmtkgc.bot@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.24.0 (2024-04-08)
+===
+
+* Update mmtk-core to v0.24.0.
+* Update Rust toolchain to 1.77.0.
+
 0.23.0 (2024-02-09)
 ===
 
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "mmtk_openjdk"
-version = "0.23.0"
+version = "0.24.0"
 authors = [" <>"]
-rust-version = "1.70.0"
+rust-version = "1.71.1"
 build = "build.rs"
 edition = "2021"
 
@@ -32,7 +32,7 @@ memoffset = "0.9.0"
 # - 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 = "2d3677d6a0099d1ff561f5668bf89b432f7cad00" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "86518d2ebc34b443c312de017dc81c7b097e3b10" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 
diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain
@@ -1 +1 @@
-1.71.1
+1.77.0
diff --git a/mmtk/src/api.rs b/mmtk/src/api.rs
@@ -527,7 +527,7 @@ pub extern "C" fn get_finalized_object() -> ObjectReference {
 
 thread_local! {
     /// Cache all the pointers reported by the current thread.
-    static NMETHOD_SLOTS: RefCell<Vec<Address>> = RefCell::new(vec![]);
+    static NMETHOD_SLOTS: RefCell<Vec<Address>> = const { RefCell::new(vec![]) };
 }
 
 /// Report a list of pointers in nmethod to mmtk.
diff --git a/mmtk/src/object_scanning.rs b/mmtk/src/object_scanning.rs
@@ -216,7 +216,7 @@ fn oop_iterate<const COMPRESSED: bool>(oop: Oop, closure: &mut impl EdgeVisitor<
 }
 
 thread_local! {
-    static CLOSURE: UnsafeCell<*mut u8> = UnsafeCell::new(std::ptr::null_mut());
+    static CLOSURE: UnsafeCell<*mut u8> = const { UnsafeCell::new(std::ptr::null_mut()) };
 }
 
 pub unsafe extern "C" fn scan_object_fn<

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ pub extern "C" fn get_finalized_object() -> ObjectReference {`
`527`	`527`
`528`	`528`	`thread_local! {`
`529`	`529`	`/// Cache all the pointers reported by the current thread.`
`530`		`- static NMETHOD_SLOTS: RefCell<Vec<Address>> = RefCell::new(vec![]);`
	`530`	`+ static NMETHOD_SLOTS: RefCell<Vec<Address>> = const { RefCell::new(vec![]) };`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`/// Report a list of pointers in nmethod to mmtk.`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ fn oop_iterate<const COMPRESSED: bool>(oop: Oop, closure: &mut impl EdgeVisitor<`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`thread_local! {`
`219`		`- static CLOSURE: UnsafeCell<*mut u8> = UnsafeCell::new(std::ptr::null_mut());`
	`219`	`+ static CLOSURE: UnsafeCell<*mut u8> = const { UnsafeCell::new(std::ptr::null_mut()) };`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`pub unsafe extern "C" fn scan_object_fn<`