Skip to content

Update to LLVM 22 #150722

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
rust-bors merged 3 commits into from
Jan 28, 2026
+23 −10
Merged

Update to LLVM 22 #150722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3510a9a
Update to LLVM 22
nikic Jan 6, 2026
749a279
Update host toolchain
nikic Jan 8, 2026
e015fc8
Adjust loongarch assembly test
nikic Jan 27, 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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[submodule "src/llvm-project"]
path = src/llvm-project
url = https://github.com/rust-lang/llvm-project.git
branch = rustc/21.1-2025-08-01
branch = rustc/22.1-2026-01-27
shallow = true
[submodule "src/doc/embedded-book"]
path = src/doc/embedded-book
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/scripts/build-clang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -ex
source shared.sh

# Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh
LLVM=llvmorg-21.1.0-rc2
LLVM=llvmorg-22.1.0-rc2

mkdir llvm-project
cd llvm-project
Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project
Open in desktop
Submodule llvm-project updated from 00d23d to 41256a
27 changes: 20 additions & 7 deletions tests/assembly-llvm/asm/loongarch-type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
//@ add-minicore
//@ revisions: loongarch32 loongarch64
//@ revisions: loongarch32s loongarch32r loongarch64

//@ assembly-output: emit-asm

//@[loongarch32] compile-flags: --target loongarch32-unknown-none
//@[loongarch32] needs-llvm-components: loongarch
//@[loongarch32s] compile-flags: --target loongarch32-unknown-none -Ctarget-feature=+32s
//@[loongarch32s] needs-llvm-components: loongarch

//@[loongarch32r] compile-flags: --target loongarch32-unknown-none
//@[loongarch32r] needs-llvm-components: loongarch
//@[loongarch32r] min-llvm-version: 22

//@[loongarch64] compile-flags: --target loongarch64-unknown-none
//@[loongarch64] needs-llvm-components: loongarch
Expand All @@ -28,8 +32,12 @@ extern "C" {

// CHECK-LABEL: sym_fn:
// CHECK: #APP
// CHECK: pcalau12i $t0, %got_pc_hi20(extern_func)
// CHECK: ld.{{[wd]}} $t0, $t0, %got_pc_lo12(extern_func)
// loongarch64: pcalau12i $t0, %got_pc_hi20(extern_func)
// loongarch64: ld.d $t0, $t0, %got_pc_lo12(extern_func)
// loongarch32s: pcalau12i $t0, %got_pc_hi20(extern_func)
// loongarch32s: ld.w $t0, $t0, %got_pc_lo12(extern_func)
// loongarch32r: pcaddu12i $t0, %got_pcadd_hi20(extern_func)
// loongarch32r: ld.w $t0, $t0, %got_pcadd_lo12(.Lpcadd_hi0)
// CHECK: #NO_APP
#[no_mangle]
pub unsafe fn sym_fn() {
Expand All @@ -38,8 +46,13 @@ pub unsafe fn sym_fn() {

// CHECK-LABEL: sym_static:
// CHECK: #APP
// CHECK: pcalau12i $t0, %got_pc_hi20(extern_static)
// CHECK: ld.{{[wd]}} $t0, $t0, %got_pc_lo12(extern_static)
// loongarch64: pcalau12i $t0, %got_pc_hi20(extern_static)
// loongarch64: ld.d $t0, $t0, %got_pc_lo12(extern_static)
// loongarch32s: pcalau12i $t0, %got_pc_hi20(extern_static)
// loongarch32s: ld.w $t0, $t0, %got_pc_lo12(extern_static)
// loongarch32r: pcaddu12i $t0, %got_pcadd_hi20(extern_static)
// loongarch32r: ld.w $t0, $t0, %got_pcadd_lo12(.Lpcadd_hi1)

// CHECK: #NO_APP
#[no_mangle]
pub unsafe fn sym_static() {
Expand Down
Loading