From 6d47f7cc6fc6802fc620bfe578d8f6a765be1fc0 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 3 Jun 2026 10:55:34 +0100 Subject: [PATCH 1/2] ci: use llvm 22.1.7 --- ci/test/01_base_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index 512d1a32e87..7f6554eaaad 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -62,7 +62,7 @@ if [ -n "$PIP_PACKAGES" ]; then fi if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then - ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-22.1.3" /llvm-project + ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-22.1.7" /llvm-project cmake -G Ninja -B /cxx_build/ \ -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ From 087f02c929cc1c09300822b02981acc710f1ab40 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 3 Jun 2026 10:56:17 +0100 Subject: [PATCH 2/2] ci: skip libunwind runtime in LLVM build Document why we use LIBCXXABI_USE_LLVM_UNWINDER=OFF. --- ci/test/01_base_install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index 7f6554eaaad..8b10ba10baa 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -64,8 +64,11 @@ fi if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-22.1.7" /llvm-project +# LLVM is configured with LIBCXXABI_USE_LLVM_UNWINDER=OFF, +# because libunwind doesn't handle exceptions under MSAN. +# https://github.com/llvm/llvm-project/issues/84348 cmake -G Ninja -B /cxx_build/ \ - -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_USE_SANITIZER="${USE_INSTRUMENTED_LIBCPP}" \ -DCMAKE_C_COMPILER=clang \