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

Fixed #5468 (crash: freebsd: llvm/RegionPrinter.cpp - AST failure)

This commit is contained in:
Daniel Marjamäki 2014-02-17 17:37:39 +01:00
parent d37359217c
commit c050a92bae
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenlist.cpp
View File

@ -758,6 +758,9 @@ static Token * createAstAtToken(Token *tok)
if (Token::simpleMatch(tok, "( {")) if (Token::simpleMatch(tok, "( {"))
return tok; return tok;
if (Token::Match(tok, "%type% <") && Token::Match(tok->linkAt(1), "> !!("))
return tok->linkAt(1);
if (tok->str() == "return" || !tok->previous() || Token::Match(tok, "%var% %op%|(|[|.|=|::") || Token::Match(tok->previous(), "[;{}] %cop%|( !!{")) { if (tok->str() == "return" || !tok->previous() || Token::Match(tok, "%var% %op%|(|[|.|=|::") || Token::Match(tok->previous(), "[;{}] %cop%|( !!{")) {
std::stack<Token *> operands; std::stack<Token *> operands;
Token * const tok1 = tok; Token * const tok1 = tok;

7
test/testtokenize.cpp
View File

@ -10077,6 +10077,8 @@ private:
links.pop(); links.pop();
} else if (Token::Match(tok, "< %type% >")) { } else if (Token::Match(tok, "< %type% >")) {
Token::createMutualLinks(tok, tok->tokAt(2)); Token::createMutualLinks(tok, tok->tokAt(2));
} else if (Token::Match(tok, "< %type% * >")) {
Token::createMutualLinks(tok, tok->tokAt(3));
} }
} }
@ -10194,13 +10196,14 @@ private:
testAst("extern int for_each_commit_graft(int (*)(int*), void *);"); // don't crash testAst("extern int for_each_commit_graft(int (*)(int*), void *);"); // don't crash
testAst("for (;;) {}"); // don't crash testAst("for (;;) {}"); // don't crash
ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)")); ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)"));
ASSERT_EQUALS("publica::b::", testAst("class C : public ::a::b<bool> { };"));
} }
void asttemplate() const { // uninstantiated templates will have <,>,etc.. void asttemplate() const { // uninstantiated templates will have <,>,etc..
ASSERT_EQUALS("a(3==", testAst("a<int>()==3")); ASSERT_EQUALS("a(3==", testAst("a<int>()==3"));
ASSERT_EQUALS("ab(== f(", testAst("a == b<c>(); f();")); ASSERT_EQUALS("ab(== f(", testAst("a == b<c>(); f();"));
ASSERT_EQUALS("publica::b::", testAst("class C : public ::a::b<bool> { };"));
ASSERT_EQUALS("f( abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };"));
} }
}; };