walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix #10591 FP unusedStructMember with value-initialized struct and typedef (#3643)

This commit is contained in:
chrchr-github 2021-12-18 22:55:52 +01:00 committed by GitHub
parent 8df25ec4e9
commit bb327be8e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenize.cpp
View File

@ -3952,7 +3952,8 @@ void Tokenizer::setVarIdPass1()
} else } else
decl = false; decl = false;
} else if (isCPP() && Token::Match(prev2, "%type% {") && Token::simpleMatch(tok2->link(), "} ;")) { // C++11 initialization style } else if (isCPP() && Token::Match(prev2, "%type% {") && Token::simpleMatch(tok2->link(), "} ;")) { // C++11 initialization style
if (Token::Match(prev2, "do|try|else") || Token::Match(prev2->tokAt(-2), "struct|class|:")) if (tok2->link() != tok2->next() && // add value-initialized variable T x{};
(Token::Match(prev2, "do|try|else") || Token::Match(prev2->tokAt(-2), "struct|class|:")))
continue; continue;
} else } else
decl = false; decl = false;

19
test/testunusedvar.cpp
View File

@ -61,6 +61,7 @@ private:
TEST_CASE(structmember15); // #3088 - #pragma pack(1) TEST_CASE(structmember15); // #3088 - #pragma pack(1)
TEST_CASE(structmember_sizeof); TEST_CASE(structmember_sizeof);
TEST_CASE(structmember16); // #10485 TEST_CASE(structmember16); // #10485
TEST_CASE(structmember17); // #10591
TEST_CASE(localvar1); TEST_CASE(localvar1);
TEST_CASE(localvar2); TEST_CASE(localvar2);
@ -1574,6 +1575,24 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'S::E' is never used.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'S::E' is never used.\n", errout.str());
} }
void structmember17() { // #10591
checkStructMemberUsage("struct tagT { int i; };\n"
"void f() {\n"
" struct tagT t{};\n"
" t.i = 0;\n" // <- used
" g(t);\n"
"};\n");
ASSERT_EQUALS("", errout.str());
checkStructMemberUsage("typedef struct tagT { int i; } typeT;\n"
"void f() {\n"
" struct typeT t{};\n"
" t.i = 0;\n" // <- used
" g(t);\n"
"};\n");
ASSERT_EQUALS("", errout.str());
}
void functionVariableUsage_(const char* file, int line, const char code[], const char filename[] = "test.cpp") { void functionVariableUsage_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
// Clear the error buffer.. // Clear the error buffer..
errout.str(""); errout.str("");