Skip to content

Commit 5b9831a

Browse files
committed
Merge bitcoin/bitcoin#29676: ci: Bump msan to llvm-18
faecf3a ci: Bump msan to llvm-18 (MarcoFalke) Pull request description: Last one: bitcoin/bitcoin#28476 ACKs for top commit: fanquake: ACK faecf3a - There is now a 18.1.2, but given it doesn't fix the instrumenting in libunwind, we don't need that here. I've tested that both jobs are now working on both arches. Tree-SHA512: 489c0b343bdc732687131317a570f3efbb18a3f548736d739da90d1a1e784df1dbb208c2da8a2a7740f27f961a841c477487a14c4d59910368f651225f0779b2
2 parents 3d216ba + faecf3a commit 5b9831a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ci/test/00_setup_env_native_fuzz_with_msan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
9+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
LIBCXX_DIR="/msan/cxx_build/"
1111
export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
1212
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"

ci/test/00_setup_env_native_msan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
9+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
LIBCXX_DIR="/msan/cxx_build/"
1111
export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
1212
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"

ci/test/01_base_install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2018-2022 The Bitcoin Core developers
3+
# Copyright (c) 2018-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

@@ -36,7 +36,7 @@ if [ -n "$PIP_PACKAGES" ]; then
3636
fi
3737

3838
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
39-
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-17.0.6 /msan/llvm-project
39+
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-18.1.1" /msan/llvm-project
4040

4141
cmake -G Ninja -B /msan/clang_build/ \
4242
-DLLVM_ENABLE_PROJECTS="clang" \
@@ -53,13 +53,14 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
5353
update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /msan/clang_build/bin/llvm-symbolizer 100
5454

5555
cmake -G Ninja -B /msan/cxx_build/ \
56-
-DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi' \
56+
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
5757
-DCMAKE_BUILD_TYPE=Release \
5858
-DLLVM_USE_SANITIZER=MemoryWithOrigins \
5959
-DCMAKE_C_COMPILER=clang \
6060
-DCMAKE_CXX_COMPILER=clang++ \
6161
-DLLVM_TARGETS_TO_BUILD=Native \
6262
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
63+
-DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
6364
-DLIBCXX_HARDENING_MODE=debug \
6465
-S /msan/llvm-project/runtimes
6566

0 commit comments

Comments
 (0)