Merge bitcoin/bitcoin#36100: ci: use LLVM 23 in *san, fuzz, *cross jobs

5ba9af6b69 ci: pass LIBCXX_INCLUDE_TESTS=OFF to LLVM build (fanquake) feb3bd46e4 clang-tidy: remove some performance-* options (fanquake) b4bd12d3d5 ci: use LLVM 23 in *san, fuzz, *cross jobs (fanquake) Pull request description: LLVM 23.1.0 was recently released, switch to using it across sanitizer, fuzzer and cross-compilation jobs. ACKs for top commit: hebasto: ACK 5ba9af6b69, I have reviewed the code and it looks OK. willcl-ark: ACK 5ba9af6b69 Tree-SHA512: 4d203bf1ec6100a21d9a185a37365d358859bbde79f44f93d2e4f5e3c9686f57ca06d6c73da7423eb234dad5b9501d7a09029a430d23b2bcf8aba95f2d88e66d
2026-09-12 13:42:10 +02:00 · 2026-09-03 12:32:49 +01:00
parent 7f0c4020e8 5ba9af6b69
commit 4ec6ff022a
11 changed files with 15 additions and 10 deletions
--- a/ci/test/00_setup_env_freebsd_cross.sh
+++ b/ci/test/00_setup_env_freebsd_cross.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8

 export CONTAINER_NAME=ci_freebsd_cross
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 export HOST=x86_64-unknown-freebsd
 export FREEBSD_VERSION=15.1
 export FREEBSD_SDK_BASENAME="freebsd-${HOST}-${FREEBSD_VERSION}"
--- a/ci/test/00_setup_env_native_asan.sh
+++ b/ci/test/00_setup_env_native_asan.sh
@@ -19,7 +19,7 @@ else
 fi

 export CONTAINER_NAME=ci_native_asan
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 export PACKAGES="systemtap-sdt-dev clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev mold python3-zmq qt6-base-dev qt6-tools-dev qt6-l10n-tools libboost-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE} libcapnp-dev capnproto python3-pip"
 export PIP_PACKAGES="--break-system-packages pycapnp"
 export NO_DEPENDS=1
--- a/ci/test/00_setup_env_native_fuzz.sh
+++ b/ci/test/00_setup_env_native_fuzz.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8

 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CONTAINER_NAME=ci_native_fuzz
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libboost-dev libsqlite3-dev libcapnp-dev capnproto"
 export NO_DEPENDS=1
 export RUN_UNIT_TESTS=false
--- a/ci/test/00_setup_env_native_fuzz_with_msan.sh
+++ b/ci/test/00_setup_env_native_fuzz_with_msan.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8

 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 LIBCXX_DIR="/cxx_build/"
 export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
 LIBCXX_FLAGS="-nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"
--- a/ci/test/00_setup_env_native_msan.sh
+++ b/ci/test/00_setup_env_native_msan.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8

 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 LIBCXX_DIR="/cxx_build/"
 export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
 LIBCXX_FLAGS="-nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"
--- a/ci/test/00_setup_env_native_tidy.sh
+++ b/ci/test/00_setup_env_native_tidy.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8

 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
 export CONTAINER_NAME=ci_native_tidy
-export TIDY_LLVM_V="22"
+export TIDY_LLVM_V="23"
 export APT_LLVM_V="${TIDY_LLVM_V}"
 export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
 export NO_DEPENDS=1
--- a/ci/test/00_setup_env_native_tsan.sh
+++ b/ci/test/00_setup_env_native_tsan.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8

 export CONTAINER_NAME=ci_native_tsan
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 LIBCXX_DIR="/cxx_build/"
 LIBCXX_FLAGS="-fsanitize=thread -nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"
 export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} llvm-${APT_LLVM_V}-dev libclang-${APT_LLVM_V}-dev libclang-rt-${APT_LLVM_V}-dev python3-zmq python3-pip"
--- a/ci/test/00_setup_env_netbsd_cross.sh
+++ b/ci/test/00_setup_env_netbsd_cross.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8

 export CONTAINER_NAME=ci_netbsd_cross
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 export HOST=x86_64-unknown-netbsd
 export NETBSD_VERSION=11.0
 export NETBSD_SDK_BASENAME="netbsd-${HOST}-${NETBSD_VERSION}"
--- a/ci/test/00_setup_env_openbsd_cross.sh
+++ b/ci/test/00_setup_env_openbsd_cross.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8

 export CONTAINER_NAME=ci_openbsd_cross
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:26.04"
-export APT_LLVM_V="22"
+export APT_LLVM_V="23"
 export HOST=x86_64-unknown-openbsd
 export OPENBSD_VERSION=7.9
 export OPENBSD_SDK_BASENAME="openbsd-${HOST}-${OPENBSD_VERSION}"
--- a/ci/test/01_base_install.sh
+++ b/ci/test/01_base_install.sh
@@ -67,7 +67,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.7" /llvm-project
+  ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-23.1.0" /llvm-project

 # LLVM is configured with LIBCXXABI_USE_LLVM_UNWINDER=OFF,
 # because libunwind doesn't handle exceptions under MSAN.
@@ -83,6 +83,7 @@ if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then
    -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
    -DLIBCXX_ABI_DEFINES="_LIBCPP_ABI_BOUNDED_ITERATORS;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STD_ARRAY;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR;_LIBCPP_ABI_BOUNDED_UNIQUE_PTR" \
    -DLIBCXX_HARDENING_MODE=debug \
+    -DLIBCXX_INCLUDE_TESTS=OFF \
    -S /llvm-project/runtimes

  ninja -C /cxx_build/ "$MAKEJOBS"
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -23,10 +23,14 @@ modernize-use-starts-ends-with,
 performance-*,
 -performance-avoid-endl,
 -performance-enum-size,
+-performance-faster-string-find,
 -performance-inefficient-string-concatenation,
 -performance-no-int-to-ptr,
 -performance-noexcept-move-constructor,
+-performance-prefer-single-char-overloads,
+-performance-string-view-conversions,
 -performance-unnecessary-value-param,
+-performance-use-std-move,
 readability-avoid-const-params-in-decls,
 readability-const-return-type,
 readability-container-contains,