Skip to content

Commit b24553c

Browse files
committed
Merge bitcoin/bitcoin#27436: test: LLVM/Clang 16 for MSAN jobs
6766715 test: LLVM/Clang 16 for MSAN jobs (fanquake) Pull request description: Similar to other CI infra changes we've made recently. Move to LLVM/Clang 16 for the MSAN jobs (which is currently using LLVM 12). See also: https://releases.llvm.org/16.0.0/tools/clang/docs/ReleaseNotes.html#sanitizers: > `-fsanitize-memory-param-retval` is turned on by default. With `-fsanitize=memory`, passing uninitialized variables to functions and returning uninitialized variables from functions is more aggressively reported. `-fno-sanitize-memory-param-retval` restores the previous behavior. ACKs for top commit: dergoegge: utACK 6766715 Tree-SHA512: a105bd1bf7f4e3ede50bb119fd8ab7f308919dc46e093eb3e94351484d65a13220e2449c40d80b8103b9ac0f4b1c8ca29576ab83e2083c26b9d8060c5802b64d
2 parents a3eea2a + 6766715 commit b24553c

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ task:
243243
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
244244

245245
task:
246-
name: '[MSan, depends] [focal]'
246+
name: '[MSan, depends] [lunar]'
247247
<< : *GLOBAL_TASK_TEMPLATE
248248
container:
249-
image: ubuntu:focal
249+
image: ubuntu:lunar
250250
env:
251251
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
252252
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"

ci/test/00_setup_env_native_fuzz_with_msan.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:20.04"
9+
export CI_IMAGE_NAME_TAG="ubuntu:23.04" # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
1010
LIBCXX_DIR="${BASE_SCRATCH_DIR}/msan/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++ -stdlib=libc++ -L${LIBCXX_DIR}lib -lc++abi -I${LIBCXX_DIR}include -I${LIBCXX_DIR}include/c++/v1 -lpthread -Wl,-rpath,${LIBCXX_DIR}lib -Wno-unused-command-line-argument"
1313
export MSAN_AND_LIBCXX_FLAGS="${MSAN_FLAGS} ${LIBCXX_FLAGS}"
1414

1515
export CONTAINER_NAME="ci_native_fuzz_msan"
16-
export PACKAGES="clang-12 llvm-12 cmake"
16+
export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev cmake"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="NO_BDB=1 NO_QT=1 CC='clang' CXX='clang++' CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"

ci/test/00_setup_env_native_msan.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:20.04"
9+
export CI_IMAGE_NAME_TAG="ubuntu:23.04" # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
1010
LIBCXX_DIR="${BASE_SCRATCH_DIR}/msan/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++ -stdlib=libc++ -L${LIBCXX_DIR}lib -lc++abi -I${LIBCXX_DIR}include -I${LIBCXX_DIR}include/c++/v1 -lpthread -Wl,-rpath,${LIBCXX_DIR}lib -Wno-unused-command-line-argument"
1313
export MSAN_AND_LIBCXX_FLAGS="${MSAN_FLAGS} ${LIBCXX_FLAGS}"
1414

1515
export CONTAINER_NAME="ci_native_msan"
16-
export PACKAGES="clang-12 llvm-12 cmake"
16+
export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev cmake"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="NO_BDB=1 NO_QT=1 CC='clang' CXX='clang++' CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"

ci/test/01_base_install.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ if [ -n "$PIP_PACKAGES" ]; then
4848
fi
4949

5050
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
51-
update-alternatives --install /usr/bin/clang++ clang++ "$(which clang++-12)" 100
52-
update-alternatives --install /usr/bin/clang clang "$(which clang-12)" 100
53-
mkdir -p "${BASE_SCRATCH_DIR}"/msan/build/
54-
git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-12.0.0 "${BASE_SCRATCH_DIR}"/msan/llvm-project
55-
cd "${BASE_SCRATCH_DIR}"/msan/build/ && cmake -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi' -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_SANITIZER=MemoryWithOrigins -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_TARGETS_TO_BUILD=X86 ../llvm-project/llvm/
56-
cd "${BASE_SCRATCH_DIR}"/msan/build/ && make "$MAKEJOBS" cxx
51+
update-alternatives --install /usr/bin/clang++ clang++ "$(which clang++-16)" 100
52+
update-alternatives --install /usr/bin/clang clang "$(which clang-16)" 100
53+
git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-16.0.1 "${BASE_SCRATCH_DIR}"/msan/llvm-project
54+
cmake -B "${BASE_SCRATCH_DIR}"/msan/build/ -DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi' -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_SANITIZER=MemoryWithOrigins -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF -S "${BASE_SCRATCH_DIR}"/msan/llvm-project/runtimes
55+
make -C "${BASE_SCRATCH_DIR}"/msan/build/ "$MAKEJOBS"
5756
fi
5857

5958
if [[ "${RUN_TIDY}" == "true" ]]; then

0 commit comments

Comments
 (0)