Merge bitcoin/bitcoin#33779: ci, iwyu: Fix warnings in src/kernel and treat them as errors

a5a8c4139c ci, iwyu: Fix warnings in `src/kernel` and treat them as errors (Hennadii Stepanov)

Pull request description:

  Now seems like a good time to update the includes in `src/kernel`.

ACKs for top commit:
  maflcko:
    review ACK a5a8c4139c 🍱
  purpleKarrot:
    ACK a5a8c4139c
  sedited:
    ACK a5a8c4139c

Tree-SHA512: ba401b27b03dee66d52d0b348972268e162506c4bafa40f408349173b68c40a11f20ca24f46c98945515e1d5c84f740d6e6784f7e4c799df46ab816cf5d11483
This commit is contained in:
merge-script committed 2026-01-19 12:46:29 +01:00
commit 5e49f5d63c
8 files changed
+17 -17

No files matched your search

+1 -1
View File
@@ -215,7 +215,7 @@ fi
if [[ "${RUN_IWYU}" == true ]]; then if [[ "${RUN_IWYU}" == true ]]; then
# TODO: Consider enforcing IWYU across the entire codebase. # TODO: Consider enforcing IWYU across the entire codebase.
FILES_WITH_ENFORCED_IWYU="/src/((crypto|index)/.*\\.cpp|node/blockstorage.cpp|node/utxo_snapshot.cpp|core_read.cpp|signet.cpp|kernel/chain.cpp)" FILES_WITH_ENFORCED_IWYU="/src/((crypto|index|kernel)/.*\\.cpp|node/blockstorage.cpp|node/utxo_snapshot.cpp|core_read.cpp|signet.cpp)"
jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns)))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_errors.json" jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns)))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_errors.json"
jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns) | not))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_warnings.json" jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns) | not))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_warnings.json"
+4 -4
View File
@@ -8,13 +8,12 @@
#include <chain.h> #include <chain.h>
#include <coins.h> #include <coins.h>
#include <consensus/amount.h>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <dbwrapper.h>
#include <kernel/caches.h> #include <kernel/caches.h>
#include <kernel/chainparams.h> #include <kernel/chainparams.h>
#include <kernel/checks.h> #include <kernel/checks.h>
#include <kernel/context.h> #include <kernel/context.h>
#include <kernel/cs_main.h>
#include <kernel/notifications_interface.h> #include <kernel/notifications_interface.h>
#include <kernel/warning.h> #include <kernel/warning.h>
#include <logging.h> #include <logging.h>
@@ -27,9 +26,9 @@
#include <serialize.h> #include <serialize.h>
#include <streams.h> #include <streams.h>
#include <sync.h> #include <sync.h>
#include <tinyformat.h>
#include <uint256.h> #include <uint256.h>
#include <undo.h> #include <undo.h>
#include <util/check.h>
#include <util/fs.h> #include <util/fs.h>
#include <util/result.h> #include <util/result.h>
#include <util/signalinterrupt.h> #include <util/signalinterrupt.h>
@@ -38,14 +37,15 @@
#include <validation.h> #include <validation.h>
#include <validationinterface.h> #include <validationinterface.h>
#include <cassert>
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
#include <exception> #include <exception>
#include <functional> #include <functional>
#include <iterator>
#include <list> #include <list>
#include <memory> #include <memory>
#include <span> #include <span>
#include <stdexcept>
#include <string> #include <string>
#include <tuple> #include <tuple>
#include <utility> #include <utility>
+5 -1
View File
@@ -21,10 +21,14 @@
#include <util/strencodings.h> #include <util/strencodings.h>
#include <algorithm> #include <algorithm>
#include <array>
#include <cassert> #include <cassert>
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <type_traits> #include <iterator>
#include <map>
#include <span>
#include <utility>
using namespace util::hex_literals; using namespace util::hex_literals;
+1 -2
View File
@@ -14,13 +14,12 @@
#include <util/hash_type.h> #include <util/hash_type.h>
#include <util/vector.h> #include <util/vector.h>
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <iterator>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <utility>
#include <vector> #include <vector>
struct AssumeutxoHash : public BaseHash<uint256> { struct AssumeutxoHash : public BaseHash<uint256> {
+1 -1
View File
@@ -8,7 +8,7 @@
#include <util/result.h> #include <util/result.h>
#include <util/translation.h> #include <util/translation.h>
#include <memory> #include <string>
namespace kernel { namespace kernel {
+2 -6
View File
@@ -12,23 +12,19 @@
#include <node/blockstorage.h> #include <node/blockstorage.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <script/script.h> #include <script/script.h>
#include <serialize.h>
#include <span.h> #include <span.h>
#include <streams.h> #include <streams.h>
#include <sync.h> #include <sync.h>
#include <tinyformat.h>
#include <uint256.h> #include <uint256.h>
#include <util/check.h> #include <util/check.h>
#include <util/overflow.h> #include <util/overflow.h>
#include <validation.h> #include <validation.h>
#include <cassert>
#include <iosfwd>
#include <iterator>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <span>
#include <utility> #include <utility>
#include <version>
namespace kernel { namespace kernel {
+1 -2
View File
@@ -7,8 +7,6 @@
#include <arith_uint256.h> #include <arith_uint256.h>
#include <consensus/amount.h> #include <consensus/amount.h>
#include <crypto/muhash.h>
#include <streams.h>
#include <uint256.h> #include <uint256.h>
#include <cstdint> #include <cstdint>
@@ -19,6 +17,7 @@ class CCoinsView;
class Coin; class Coin;
class COutPoint; class COutPoint;
class CScript; class CScript;
class MuHash3072;
namespace node { namespace node {
class BlockManager; class BlockManager;
} // namespace node } // namespace node
+2
View File
@@ -8,6 +8,8 @@
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <util/hasher.h> #include <util/hasher.h>
#include <cstddef>
#include <cstdint>
#include <list> #include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>