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

Fix #10849 FP constStatement with pointers in lambda (#3961)

This commit is contained in:
chrchr-github 2022-04-01 19:50:40 +02:00 committed by GitHub
parent 5bea50cd36
commit 4bf8718dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/tokenize.cpp
View File

@ -7321,11 +7321,21 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
if (!tok->next()->link())
syntaxError(tokBegin);
// Check for lambdas before skipping
for (Token* tok2 = tok->next(); tok2 != tok->next()->link(); tok2 = tok2->next()) {
Token* lambdaEnd = findLambdaEndScope(tok2);
if (!lambdaEnd)
continue;
simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
if (Token::Match(tok->tokAt(-2), ") . %name%")) { // trailing return type
// TODO: support lambda without parameter clause?
Token* lambdaStart = tok->linkAt(-2)->previous();
if (Token::simpleMatch(lambdaStart, "]"))
lambdaStart = lambdaStart->link();
Token* lambdaEnd = findLambdaEndScope(lambdaStart);
if (lambdaEnd)
simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
} else {
for (Token* tok2 = tok->next(); tok2 != tok->next()->link(); tok2 = tok2->next()) {
Token* lambdaEnd = findLambdaEndScope(tok2);
if (!lambdaEnd)
continue;
simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
}
}
tok = tok->next()->link();
}

2
lib/valueflow.cpp
View File

@ -7888,7 +7888,7 @@ static void valueFlowDynamicBufferSize(TokenList* tokenlist, SymbolDatabase* sym
}
else {
typeTok = newTok->astOperand1();
if (typeTok && typeTok->str() == "{")
if (typeTok->str() == "{")
typeTok = typeTok->astOperand1();
}
if (bracTok && bracTok->astOperand2() && bracTok->astOperand2()->hasKnownIntValue())

9
test/testincompletestatement.cpp
View File

@ -620,6 +620,15 @@ private:
" for (int i = 0; ;) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("class T {};\n" // #10849
"void f() {\n"
" auto g = [](const T* t) -> int {\n"
" const T* u{}, * v{};\n"
" return 0;\n"
" };\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void vardecl() {

14
test/testvarid.cpp
View File

@ -2687,6 +2687,20 @@ private:
const char exp[] = "1: auto g@1 ; g@1 = [ ] ( std :: function < void ( ) > p@2 ) { } ;\n";
ASSERT_EQUALS(exp, tokenize(code));
}
// # 10849
{
const char code[] = "class T {};\n"
"auto g = [](const T* t) -> int {\n"
" const T* u{}, *v{};\n"
" return 0;\n"
"};\n";
const char exp[] = "1: class T { } ;\n"
"2: auto g@1 ; g@1 = [ ] ( const T * t@2 ) . int {\n"
"3: const T * u@3 { } ; const T * v@4 { } ;\n"
"4: return 0 ;\n"
"5: } ;\n";
ASSERT_EQUALS(exp, tokenize(code));
}
}
void varid_lambda_mutable() {