From a21eee0396ba56b7089bdfae10683918f7973bbe Mon Sep 17 00:00:00 2001 From: dianqk Date: Wed, 22 Apr 2026 20:30:52 +0800 Subject: [PATCH 1/2] Update LLVM to 22.1.4 --- .gitmodules | 2 +- src/llvm-project | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b11b47ec108bf..c39fabac55f3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,7 +25,7 @@ [submodule "src/llvm-project"] path = src/llvm-project url = https://github.com/rust-lang/llvm-project.git - branch = rustc/22.1-2026-01-27 + branch = rustc/22.1-2026-03-22 shallow = true [submodule "src/doc/embedded-book"] path = src/doc/embedded-book diff --git a/src/llvm-project b/src/llvm-project index 1cb4e3833c191..eaab4d9841b9a 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit 1cb4e3833c1919c2e6fb579a23ac0e2b22587b7e +Subproject commit eaab4d9841b9a8a12783d927b2df2291c1c79269 From 250beb317422dad63d9bdefee9d82c55a732ba60 Mon Sep 17 00:00:00 2001 From: dianqk Date: Fri, 24 Apr 2026 06:36:07 +0800 Subject: [PATCH 2/2] explicit-tail-calls: disable two tests on LoongArch for LLVM 22 also Tail call support for LoongArch was reverted in LLVM 22 also. --- tests/ui/explicit-tail-calls/support/bystack.rs | 4 ++-- tests/ui/explicit-tail-calls/support/byval.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ui/explicit-tail-calls/support/bystack.rs b/tests/ui/explicit-tail-calls/support/bystack.rs index 0f10fe3d172ec..ddd9c79f5c72f 100644 --- a/tests/ui/explicit-tail-calls/support/bystack.rs +++ b/tests/ui/explicit-tail-calls/support/bystack.rs @@ -36,11 +36,11 @@ //@ revisions: loongarch32 //@[loongarch32] compile-flags: --target loongarch32-unknown-none //@[loongarch32] needs-llvm-components: loongarch -//@[loongarch32] ignore-llvm-version: 23 +//@[loongarch32] ignore-llvm-version: 22 - 23 //@ revisions: loongarch64 //@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu //@[loongarch64] needs-llvm-components: loongarch -//@[loongarch64] ignore-llvm-version: 23 +//@[loongarch64] ignore-llvm-version: 22 - 23 //@ revisions: bpf //@[bpf] compile-flags: --target bpfeb-unknown-none //@[bpf] needs-llvm-components: bpf diff --git a/tests/ui/explicit-tail-calls/support/byval.rs b/tests/ui/explicit-tail-calls/support/byval.rs index be11741fd0165..f451a953f2aae 100644 --- a/tests/ui/explicit-tail-calls/support/byval.rs +++ b/tests/ui/explicit-tail-calls/support/byval.rs @@ -36,11 +36,11 @@ //@ revisions: loongarch32 //@[loongarch32] compile-flags: --target loongarch32-unknown-none //@[loongarch32] needs-llvm-components: loongarch -//@[loongarch32] ignore-llvm-version: 23 +//@[loongarch32] ignore-llvm-version: 22 - 23 //@ revisions: loongarch64 //@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu //@[loongarch64] needs-llvm-components: loongarch -//@[loongarch64] ignore-llvm-version: 23 +//@[loongarch64] ignore-llvm-version: 22 - 23 //@ revisions: bpf //@[bpf] compile-flags: --target bpfeb-unknown-none //@[bpf] needs-llvm-components: bpf