Skip to content
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

Jump to bottom

Partial fix for #12302 internalAstError using lambda #5816

Merged
merged 4 commits into from
Jan 2, 2024
Merged

Partial fix for #12302 internalAstError using lambda #5816

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
7d5ad25
Fix MSVC warning: "declaration hides class member"
chrchr-github Jan 2, 2024
77049b6
Partial fix for #12302 internalAstError using lambda
chrchr-github Jan 2, 2024
c9872b2
Add test for #11760
chrchr-github Jan 2, 2024
44c1e6c
Simplify
chrchr-github Jan 2, 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
6 changes: 5 additions & 1 deletion lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,12 @@ static bool iscpp11init_impl(const Token * const tok)
}

auto isCaseStmt = [](const Token* colonTok) {
if (!Token::Match(colonTok->tokAt(-1), "%name%|%num%|%char% :"))
if (!Token::Match(colonTok->tokAt(-1), "%name%|%num%|%char%|) :"))
return false;
if (const Token* castTok = colonTok->linkAt(-1)) {
if (Token::simpleMatch(castTok->astParent(), "case"))
return true;
}
const Token* caseTok = colonTok->tokAt(-2);
while (caseTok && Token::Match(caseTok->tokAt(-1), "::|%name%"))
caseTok = caseTok->tokAt(-1);
Expand Down
4 changes: 2 additions & 2 deletions test/testcppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ class TestCppcheck : public TestFixture {
ASSERT_EQUALS(1, cppcheck.check(test_file_a.path()));
ASSERT_EQUALS(1, cppcheck.check(test_file_b.path()));
// TODO: how to properly disable these warnings?
errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& errmsg) {
return errmsg.id == "logChecker";
errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
return msg.id == "logChecker";
}), errorLogger.errmsgs.end());
// the internal errorlist is cleared after each check() call
ASSERT_EQUALS(2, errorLogger.errmsgs.size());
Expand Down
13 changes: 13 additions & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6788,6 +6788,19 @@ class TestTokenizer : public TestFixture {
" });\n"
"}\n"));

ASSERT_NO_THROW(tokenizeAndStringify("struct A { A(int) {} };\n"
"void g(void (*)(int));\n"
"void f() {\n"
" g([](int i) {\n"
" switch (i) {\n"
" case static_cast<int>(1): {\n"
" A a(i);\n"
" if (1) {}\n"
" }\n"
" }\n"
" });\n"
"}\n"));

// #11378
ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };"));

Expand Down
18 changes: 17 additions & 1 deletion test/testuninitvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3735,7 +3735,7 @@ class TestUninitVar : public TestFixture {
"}\n");
ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:8]: (warning) Uninitialized variable: x\n", errout.str());

valueFlowUninit("int do_something();\n"
valueFlowUninit("int do_something();\n" // #11983
"int set_st(int *x);\n"
"int bar();\n"
"void foo() {\n"
Expand All @@ -3755,6 +3755,22 @@ class TestUninitVar : public TestFixture {
" if(status == 1 && x > 0){}\n"
"}\n");
ASSERT_EQUALS("", errout.str());

valueFlowUninit("int h(bool, bool*);\n" // #11760
"int f(bool t) {\n"
" int i = 0;\n"
" bool b;\n"
" if (t)\n"
" g();\n"
" if (i == 0)\n"
" i = h(t, &b);\n"
" if (i == 0 && b)\n"
" i = h(t, &b);\n"
" if (i == 0 && b)\n"
" i = h(t, &b);\n"
" return i;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}

void valueFlowUninit_uninitvar2()
Expand Down
Loading