Skip to content

Commit 007d6e0

Browse files
qinsoonmmtkgc-bot
andauthored
Move to Rust 1.92 (#338)
Co-authored-by: mmtkgc-bot <mmtkgc.bot@gmail.com>
1 parent 3e27334 commit 007d6e0

File tree

6 files changed

+14
-11
lines changed

6 files changed

+14
-11
lines changed

.github/workflows/stylecheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Style check
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- jdk-11
77

88
concurrency:
99
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/test-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: DaCapo Tests
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- jdk-11
77

88
concurrency:
99
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

mmtk/Cargo.lock

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mmtk_openjdk"
33
version = "0.31.0"
44
authors = [" <>"]
5-
rust-version = "1.74.1"
5+
rust-version = "1.84.0"
66
build = "build.rs"
77
edition = "2021"
88

@@ -36,7 +36,7 @@ probe = "0.5"
3636
# - change branch
3737
# - change repo name
3838
# But other changes including adding/removing whitespaces in commented lines may break the CI.
39-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "e25ad8bb969f5d650de3f1946582075923bafcc9" }
39+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "e30d0a0866fe66d352eb09eb7f9e9466dc649172" }
4040
# Uncomment the following to build locally
4141
# mmtk = { path = "../repos/mmtk-core" }
4242

mmtk/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.83.0
1+
1.92.0

mmtk/src/slots.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ impl<const COMPRESSED: bool> OpenJDKSlot<COMPRESSED> {
9494
}
9595

9696
fn x86_read_unaligned<T, const UNTAG: bool>(&self) -> T {
97-
debug_assert!(cfg!(any(target_arch = "x86", target_arch = "x86_64")));
97+
const {
98+
assert!(cfg!(any(target_arch = "x86", target_arch = "x86_64")));
99+
}
98100
// Workaround: On x86 (including x86_64), machine instructions may contain pointers as
99101
// immediates, and they may be unaligned. It is an undefined behavior in Rust to
100102
// dereference unaligned pointers. We have to explicitly use unaligned memory access
@@ -113,7 +115,9 @@ impl<const COMPRESSED: bool> OpenJDKSlot<COMPRESSED> {
113115
}
114116

115117
fn x86_write_unaligned<T: Copy, const UNTAG: bool>(&self, v: T) {
116-
debug_assert!(cfg!(any(target_arch = "x86", target_arch = "x86_64")));
118+
const {
119+
assert!(cfg!(any(target_arch = "x86", target_arch = "x86_64")));
120+
}
117121
unsafe {
118122
let slot = if UNTAG {
119123
self.untagged_address()

0 commit comments

Comments
 (0)