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

Fix issue 9644: Token::astOperand1() cyclic dependency on valid C++ code (#2590) 

* Remove check for lambda

* Add test case
This commit is contained in:
Paul Fultz II 2020-04-04 03:55:31 -05:00 committed by GitHub
parent e0acd1abf8
commit 40e1e82a65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/tokenlist.cpp
View File

@ -1309,21 +1309,6 @@ static void createAstAtTokenInner(Token * const tok1, const Token *endToken, boo
const Token * const endToken2 = tok->link();
for (; tok && tok != endToken && tok != endToken2; tok = tok ? tok->next() : nullptr)
tok = createAstAtToken(tok, cpp);
} else if (const Token * lambdaEnd = findLambdaEndScope(tok)) {
Token *bodyStart = lambdaEnd->link();
if (Token::Match(bodyStart, ". %name%") && bodyStart->originalName() == "->") {
bodyStart = bodyStart->next();
while (Token::Match(bodyStart, "%name%|::"))
bodyStart = bodyStart->next();
if (Token::simpleMatch(bodyStart, "<") && Token::simpleMatch(bodyStart->link(), "> {"))
bodyStart = bodyStart->link()->next();
}
if (Token::simpleMatch(bodyStart, "{")) {
tok = bodyStart;
const Token * const endToken2 = tok->link();
for (; tok && tok != endToken && tok != endToken2; tok = tok ? tok->next() : nullptr)
tok = createAstAtToken(tok, cpp);
}
}
}
}

7
test/testtokenize.cpp
View File

@ -8244,6 +8244,13 @@ private:
"void e(\n"
" int, a<void()> f = [] {});\n"))
// #9644
ASSERT_NO_THROW(tokenizeAndStringify("void a() {\n"
" char b[]{};\n"
" auto c = [](int d) {\n"
" for (char e = 0; d;) {}\n"
" };\n"
"}\n"))
// #9537
ASSERT_NO_THROW(tokenizeAndStringify("struct a {\n"
" template <typename b> a(b) {}\n"