Skip to content

Fix #13345: FP unusedStructMember when member is only used in offsetof() #7041

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
danmar merged 4 commits into from
Nov 26, 2024
Merged

Fix #13345: FP unusedStructMember when member is only used in offsetof() #7041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdaa1c3
fix #13345
ludviggunne Nov 26, 2024
c12f7f7
add test
ludviggunne Nov 26, 2024
364fa6a
remove redundant null checks
ludviggunne Nov 26, 2024
3dab3dc
remove newline in test
ludviggunne Nov 26, 2024
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
8 changes: 8 additions & 0 deletions lib/checkunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,14 @@ void CheckUnusedVar::checkStructMemberUsage()
use = true;
break;
}
// Member referenced in offsetof
if (Token::Match(tok, ("offsetof ( struct| " + scope.className + " , %name%").c_str())) {
tok = tok->astSibling()->astOperand2();
if (tok->str() == var.name()) {
use = true;
break;
}
}
if (tok->variable() != &var)
continue;
if (tok != var.nameToken()) {
Expand Down
9 changes: 9 additions & 0 deletions test/testunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class TestUnusedVar : public TestFixture {
TEST_CASE(structmember23);
TEST_CASE(structmember24); // #10847
TEST_CASE(structmember25);
TEST_CASE(structmember26); // #13345
TEST_CASE(structmember_macro);
TEST_CASE(classmember);

Expand Down Expand Up @@ -1962,6 +1963,14 @@ class TestUnusedVar : public TestFixture {
errout_str());
}

void structmember26() { // #13345
checkStructMemberUsage("struct foobar {\n"
" char unused;\n"
"};\n"
"size_t offset_unused = offsetof(struct foobar, unused);\n");
ASSERT_EQUALS("", errout_str());
}

void structmember_macro() {
checkStructMemberUsageP("#define S(n) struct n { int a, b, c; };\n"
"S(unused);\n");
Expand Down