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

Fix #7375 static_assert shouldn't be reported by --check-library (#4276) 

* No need to check smart pointers, since they take template arguments

* Fix #7375 static_assert shouldn't be reported by --check-library
This commit is contained in:
chrchr-github 2022-07-13 21:08:43 +02:00 committed by GitHub
parent b31e40f578
commit 49117f5aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkfunctions.cpp
View File

@ -608,10 +608,10 @@ void CheckFunctions::checkLibraryMatchFunctions()
else if (insideNew) else if (insideNew)
continue; continue;
if (!Token::Match(tok, "%name% (") || Token::Match(tok, "asm|sizeof|catch")) if (tok->isKeyword() || !Token::Match(tok, "%name% ("))
continue; continue;
if (tok->varId() != 0 || tok->type() || tok->isStandardType() || tok->isControlFlowKeyword()) if (tok->varId() != 0 || tok->type() || tok->isStandardType())
continue; continue;
if (tok->linkAt(1)->strAt(1) == "(") if (tok->linkAt(1)->strAt(1) == "(")
@ -630,9 +630,6 @@ void CheckFunctions::checkLibraryMatchFunctions()
if (mSettings->library.functions.find(functionName) != mSettings->library.functions.end()) if (mSettings->library.functions.find(functionName) != mSettings->library.functions.end())
continue; continue;
if (mSettings->library.smartPointers.find(functionName) != mSettings->library.smartPointers.end())
continue;
const Token* start = tok; const Token* start = tok;
while (Token::Match(start->tokAt(-2), "%name% ::")) while (Token::Match(start->tokAt(-2), "%name% ::"))
start = start->tokAt(-2); start = start->tokAt(-2);

14
test/testfunctions.cpp
View File

@ -1813,6 +1813,20 @@ private:
"}"); "}");
TODO_ASSERT_EQUALS("", "[test.cpp:6]: (information) --check-library: There is no matching configuration for function cb()\n", errout.str()); TODO_ASSERT_EQUALS("", "[test.cpp:6]: (information) --check-library: There is no matching configuration for function cb()\n", errout.str());
// #7375
check("void f() {\n"
" struct S { int i; char c; };\n"
" size_t s = sizeof(S);\n"
" static_assert(s == 9);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("void f(char) {}\n"
"void g() {\n"
" f(int8_t(1));\n"
"}\n");
ASSERT_EQUALS("", errout.str());
settings.severity = severity_old; settings.severity = severity_old;
settings.checkLibrary = false; settings.checkLibrary = false;
} }