The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/34298.

Reviews

See the guideline for information on the review process.

If your review is incorrectly listed, please copy-paste <!--meta-tag:bot-skip--> into the comment that the bot should ignore.

Conflicts

Reviewers, this pull request conflicts with the following ones:

• #34310 (iwyu: Add missed line to IWYU patch by hebasto)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

🚧 At least one of the CI tasks failed.
_{Task lint: https://github.com/bitcoin/bitcoin/actions/runs/21025279080/job/60448207726
LLM reason (✨ experimental): Lint check failed in CI due to shellcheck SC2046 warning causing the lint suite to fail.}

The CI logs show that the example from the pull description is now working correctly: https://github.com/bitcoin/bitcoin/actions/runs/21027399192/job/60455097235?pr=34298#step:11:38466:

--- a/src/bench/streams_findbyte.cpp
+++ b/src/bench/streams_findbyte.cpp
@@ -7,9 +7,12 @@
 #include <test/util/setup_common.h>
 #include <util/fs.h>
 
+#include <cassert>
 #include <cstddef>

The CI logs show that the example from the pull description is now working correctly: https://github.com/bitcoin/bitcoin/actions/runs/21027399192/job/60455097235?pr=34298#step:11:38466:

--- a/src/bench/streams_findbyte.cpp
+++ b/src/bench/streams_findbyte.cpp
@@ -7,9 +7,12 @@
 #include <test/util/setup_common.h>
 #include <util/fs.h>
 
+#include <cassert>
 #include <cstddef>

However, IWYU output still mentions C headers:

2026-01-15T10:19:53.0393770Z /home/admin/actions-runner/_work/_temp/src/bench/streams_findbyte.cpp should add these lines:
2026-01-15T10:19:53.0394044Z #include <assert.h>                  // for assert
2026-01-15T10:19:53.0394243Z #include <memory>                    // for make_unique, unique_ptr
2026-01-15T10:19:53.0394460Z #include <string>                    // for basic_string

Currently, there is a massive iwyu patch to try to implement modernize-deprecated-headers.

However, it does not work.

The patch has been fixed in #34310.

However, IWYU output still mentions C headers:

Yeah, this will also be the case with a vanilla iwyu, when run locally. Not sure if anyone does this, but the py script could be applicable there as well. Not sure if anyone runs iwyu locally, and if they'd prefer a patch to iwyu, or a fixup script, but happy to close this one, if people prefer a patch.

I am happy with both approaches, this one and #34310, though I have a slight preference for the latter for the following reasons:

1. It is documented in the source code:

   If you did want to replace assert.h with cassert, you'd change it to a public->private mapping.

2. We build IWYU from source and already applying another patch.
3. The patch was chosen over a tiny script because it is "easier to review and maintain".
4. Patches can be applied when building IWYU locally.

If the patch size is an issue, I'd prefer the previous "scripted-diff" style script to modify the source code.

🐙 This pull request conflicts with the target branch and needs rebase.

Closing for now. It can be re-opened in the future, if there is need