From 2a307cb49066d1df2d63fe65e82eb2feb7a58044 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Wed, 7 Jan 2026 23:47:18 +0000 Subject: [PATCH 1/4] Move to Rust 1.92 --- mmtk/Cargo.lock | 7 +++---- mmtk/Cargo.toml | 4 ++-- mmtk/rust-toolchain | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index 943bf1c0..f40827eb 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -491,7 +491,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.31.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=e25ad8bb969f5d650de3f1946582075923bafcc9#e25ad8bb969f5d650de3f1946582075923bafcc9" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=d7a06ced02c588c58a7f6064d474e5de8826f948#d7a06ced02c588c58a7f6064d474e5de8826f948" dependencies = [ "atomic", "atomic-traits", @@ -505,7 +505,6 @@ dependencies = [ "downcast-rs", "enum-map", "env_logger", - "idna_adapter", "is-terminal", "itertools", "lazy_static", @@ -530,7 +529,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.31.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=e25ad8bb969f5d650de3f1946582075923bafcc9#e25ad8bb969f5d650de3f1946582075923bafcc9" +source = "git+https://github.com/qinsoon/mmtk-core.git?rev=d7a06ced02c588c58a7f6064d474e5de8826f948#d7a06ced02c588c58a7f6064d474e5de8826f948" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index a5e16855..d665d92e 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -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" @@ -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/qinsoon/mmtk-core.git", rev = "d7a06ced02c588c58a7f6064d474e5de8826f948" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain index 6b4de0a4..7f229af9 100644 --- a/mmtk/rust-toolchain +++ b/mmtk/rust-toolchain @@ -1 +1 @@ -1.83.0 +1.92.0 From c2ec1283c49e0875791c701a779aec1346622542 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Wed, 7 Jan 2026 23:49:38 +0000 Subject: [PATCH 2/4] Run CI tests for jdk-11 --- .github/workflows/stylecheck.yml | 2 +- .github/workflows/test-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stylecheck.yml b/.github/workflows/stylecheck.yml index 92ad4063..f8b6645d 100644 --- a/.github/workflows/stylecheck.yml +++ b/.github/workflows/stylecheck.yml @@ -3,7 +3,7 @@ name: Style check on: pull_request: branches: - - master + - jdk-11 concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index c56080bc..80e4542d 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -3,7 +3,7 @@ name: DaCapo Tests on: pull_request: branches: - - master + - jdk-11 concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} From 26454ae8e67e22c20c1983fbcbf3b130917ffaf2 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Wed, 7 Jan 2026 23:54:14 +0000 Subject: [PATCH 3/4] Fix style check --- mmtk/src/slots.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mmtk/src/slots.rs b/mmtk/src/slots.rs index e299247e..02896836 100644 --- a/mmtk/src/slots.rs +++ b/mmtk/src/slots.rs @@ -94,7 +94,9 @@ impl OpenJDKSlot { } fn x86_read_unaligned(&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 @@ -113,7 +115,9 @@ impl OpenJDKSlot { } fn x86_write_unaligned(&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() From 3fd8d921d34513e09ba9d9fa2f3c478c9d8b1f7c Mon Sep 17 00:00:00 2001 From: mmtkgc-bot Date: Fri, 9 Jan 2026 04:05:24 +0000 Subject: [PATCH 4/4] Update mmtk-core to e30d0a0866fe66d352eb09eb7f9e9466dc649172 --- mmtk/Cargo.lock | 4 ++-- mmtk/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index f40827eb..06681c8b 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -491,7 +491,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.31.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=d7a06ced02c588c58a7f6064d474e5de8826f948#d7a06ced02c588c58a7f6064d474e5de8826f948" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=e30d0a0866fe66d352eb09eb7f9e9466dc649172#e30d0a0866fe66d352eb09eb7f9e9466dc649172" dependencies = [ "atomic", "atomic-traits", @@ -529,7 +529,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.31.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=d7a06ced02c588c58a7f6064d474e5de8826f948#d7a06ced02c588c58a7f6064d474e5de8826f948" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=e30d0a0866fe66d352eb09eb7f9e9466dc649172#e30d0a0866fe66d352eb09eb7f9e9466dc649172" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index d665d92e..00e76f8d 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -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/qinsoon/mmtk-core.git", rev = "d7a06ced02c588c58a7f6064d474e5de8826f948" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "e30d0a0866fe66d352eb09eb7f9e9466dc649172" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" }