Skip to content

Fix #11577 FN unusedStructMember when casting address (regression, reverts #10684) #4816

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
firewave merged 1 commit into from
Apr 4, 2023
Merged

Fix #11577 FN unusedStructMember when casting address (regression, reverts #10684) #4816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions lib/checkunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,20 +1466,6 @@ void CheckUnusedVar::checkStructMemberUsage()
bailout = true;
break;
}
if (var && (var->typeStartToken()->str() == scope.className || var->typeEndToken()->str() == scope.className)) {
const std::string addressPattern("!!" + scope.className + " & " + var->name()); // cast from struct
const Token* addrTok = scope.bodyEnd;
do {
addrTok = Token::findmatch(addrTok, addressPattern.c_str());
if ((addrTok && addrTok->str() == ")" && addrTok->link()->isCast()) || isCPPCast(addrTok)) {
bailout = true;
break;
}
if (addrTok)
addrTok = addrTok->next();
} while (addrTok);
}

if (bailout)
break;
}
Expand Down
11 changes: 9 additions & 2 deletions test/testunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,15 +1651,22 @@ class TestUnusedVar : public TestFixture {
" uint8_t* p = (uint8_t*)&s;\n"
" return p[10];\n"
"};\n");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'S::padding' is never used.\n", errout.str());

checkStructMemberUsage("struct S { uint8_t padding[500]; };\n"
"uint8_t f(const S& s) {\n"
" std::cout << &s;\n"
" auto p = reinterpret_cast<const uint8_t*>(&s);\n"
" return p[10];\n"
"};\n");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'S::padding' is never used.\n", errout.str());

checkStructMemberUsage("struct S { int i, j; };\n" // #11577
"void f(S s) {\n"
" void* p = (void*)&s;\n"
" if (s.i) {}\n"
"}\n");
ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'S::j' is never used.\n", errout.str());
}

void structmember19() {
Expand Down