Skip to content

fix: resolve or sidestep compiler warnings, re-enable -Werror for Clang, merge bitcoin#13633 #6638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 22, 2025
Merged

fix: resolve or sidestep compiler warnings, re-enable -Werror for Clang, merge bitcoin#13633 #6638

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c9cb9a6
merge bitcoin#13633: Drop dead code from Stacks
kwvg Jul 6, 2018
df9c926
chore: drop unused `EraseOldDBData()`
kwvg Apr 20, 2025
f6d1eb9
chore: drop extraneous unused `ApplyStats()` definition
kwvg Apr 20, 2025
6729d69
fix: add missing lock annotation in lambda expression
kwvg Apr 20, 2025
9315e69
move-only: keep functions used in wallet-enabled segments within macro
kwvg Apr 20, 2025
53d29e9
fix: sidestep `-Wunused-function` warnings with `[[maybe_unused]]`
kwvg Apr 20, 2025
184b463
fix: resolve `-Wdelete-non-abstract-non-virtual-dtor` warnings
kwvg Apr 20, 2025
7a52083
fix: resolve `-Wmissing-field-initializers` warnings
kwvg Apr 20, 2025
7459b1e
fix: resolve `-Wunused-private-field` warnings
kwvg Apr 22, 2025
10cb3e4
fix: resolve `-Wlogical-op-parentheses` warnings
kwvg Apr 20, 2025
1015f9b
fix: resolve `-Wunreachable-code` warnings, add comment for explanation
kwvg Apr 20, 2025
c7748cd
revert: don't build using `-Werror` when using Clang
kwvg Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wallet/scriptpubkeyman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ bool LegacyScriptPubKeyMan::CheckDecryptionKey(const CKeyingMaterial& master_key
if (keyFail) {
return false;
}
if (!keyPass && !accept_no_keys && (m_hd_chain.IsNull() || !m_hd_chain.IsNull() && !m_hd_chain.IsCrypted())) {
if (!keyPass && !accept_no_keys && (m_hd_chain.IsNull() || (!m_hd_chain.IsNull() && !m_hd_chain.IsCrypted()))) {
Copy link
Collaborator

@knst knst Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to simplify to

if (!keyPass && !accept_no_keys && (m_hd_chain.IsNull() || !m_hd_chain.IsCrypted()))) {

Proof. Both functions:

bool f(bool a, bool b, bool c) {
    return !a && (b || !b && !c);
}
bool g(bool a, bool b, bool c) {
    return !a && (b || !c);
}

are compiled to same binary:

        xor     edx, 1
        xor     eax, eax
        or      edx, esi
        test    dil, dil
        cmove   eax, edx
        ret

return false;
}

Expand Down