Skip to content

Move to Rust 1.92 #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmtkgc-bot merged 4 commits into from
Jan 9, 2026
Merged

Move to Rust 1.92 #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a307cb
Move to Rust 1.92
qinsoon Jan 7, 2026
c2ec128
Run CI tests for jdk-11
qinsoon Jan 7, 2026
26454ae
Fix style check
qinsoon Jan 7, 2026
3fd8d92
Update mmtk-core to e30d0a0866fe66d352eb09eb7f9e9466dc649172
mmtkgc-bot Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/stylecheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Style check
on:
pull_request:
branches:
- master
- jdk-11

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: DaCapo Tests
on:
pull_request:
branches:
- master
- jdk-11

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
7 changes: 3 additions & 4 deletions mmtk/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "mmtk_openjdk"
version = "0.31.0"
authors = [" <>"]
rust-version = "1.74.1"
rust-version = "1.84.0"
build = "build.rs"
edition = "2021"

Expand Down Expand Up @@ -36,7 +36,7 @@ probe = "0.5"
# - 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 = "e25ad8bb969f5d650de3f1946582075923bafcc9" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "e30d0a0866fe66d352eb09eb7f9e9466dc649172" }
# Uncomment the following to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down
2 changes: 1 addition & 1 deletion mmtk/rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.83.0
1.92.0
8 changes: 6 additions & 2 deletions mmtk/src/slots.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ impl<const COMPRESSED: bool> OpenJDKSlot<COMPRESSED> {
}

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

fn x86_write_unaligned<T: Copy, const UNTAG: bool>(&self, v: T) {
debug_assert!(cfg!(any(target_arch = "x86", target_arch = "x86_64")));
const {
assert!(cfg!(any(target_arch = "x86", target_arch = "x86_64")));
}
unsafe {
let slot = if UNTAG {
self.untagged_address()
Expand Down
Loading