Skip to content

Commit 1ca1df9

Browse files
committed
Merge bitcoin/bitcoin#30519: ci: add _LIBCPP_REMOVE_TRANSITIVE_INCLUDES to TSAN (libc++) job
e3edacc ci: add _LIBCPP_REMOVE_TRANSITIVE_INCLUDES to TSAN job (fanquake) 6e78616 refactor: fix missing includes (fanquake) Pull request description: Add `_LIBCPP_REMOVE_TRANSITIVE_INCLUDES` to one of the libc++ CI jobs, to catch missing includes, that are otherwise hidden by transitive includes inside libc++. A more appropriate place for this might be the tidy job, but that does not use libc++. See https://libcxx.llvm.org/DesignDocs/HeaderRemovalPolicy.html for more information. ACKs for top commit: maflcko: re-ACK e3edacc Tree-SHA512: 3fb2e9bbbf4bb1570633d52939875ee674d934b645a4037a309643f84ab69edf0fb5b6cfcbd02fa7d92052a64fa63f31979a58fede23593c4df7c33a8cb2953a
2 parents fa0b5d6 + e3edacc commit 1ca1df9

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

ci/test/00_setup_env_native_tsan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1111
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
1212
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' --with-sanitizers=thread"
14+
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES' --with-sanitizers=thread"

src/crypto/sha256.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
#include <crypto/sha256.h>
88
#include <crypto/common.h>
99

10-
#include <assert.h>
11-
#include <string.h>
10+
#include <algorithm>
11+
#include <cassert>
12+
#include <cstring>
1213

1314
#if !defined(DISABLE_OPTIMIZED_SHA256)
1415
#include <compat/cpuid.h>

src/init.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
#ifndef BITCOIN_INIT_H
77
#define BITCOIN_INIT_H
88

9-
#include <any>
10-
#include <memory>
11-
#include <string>
9+
#include <atomic>
1210

1311
//! Default value for -daemon option
1412
static constexpr bool DEFAULT_DAEMON = false;

0 commit comments

Comments
 (0)