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

SymbolDatabase: Removed unnecessary bailout in function matching for pointers in function overload matching

This commit is contained in:
PKEuS 2017-03-15 18:45:33 +01:00
parent b27ba72fdd
commit bcba27fbb9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/symboldatabase.cpp
View File

@ -3977,7 +3977,7 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
} }
// Try to evaluate the apparently more complex expression // Try to evaluate the apparently more complex expression
else if (!funcarg->isArrayOrPointer()) { // TODO: Pointers else {
const Token* argtok = arguments[j]; const Token* argtok = arguments[j];
while (argtok->astParent() && argtok->astParent() != tok->next() && argtok->astParent()->str() != ",") { while (argtok->astParent() && argtok->astParent() != tok->next() && argtok->astParent()->str() != ",") {
argtok = argtok->astParent(); argtok = argtok->astParent();

12
test/testsymboldatabase.cpp
View File

@ -3682,16 +3682,18 @@ private:
} }
void findFunction16() { void findFunction16() {
GET_SYMBOL_DB("struct C { int i; static int si; float f; };\n" GET_SYMBOL_DB("struct C { int i; static int si; float f; int* ip; float* fp};\n"
"void foo(float a) { }\n" "void foo(float a) { }\n"
"void foo(int a) { }\n" "void foo(int a) { }\n"
"void foo(bool a) { }\n" "void foo(int* a) { }\n"
"void func(C c, C* cp) {\n" "void func(C c, C* cp) {\n"
" foo(c.i);\n" " foo(c.i);\n"
" foo(cp->i);\n" " foo(cp->i);\n"
" foo(c.f);\n" " foo(c.f);\n"
" foo(c.si);\n" " foo(c.si);\n"
" foo(C::si);\n" " foo(C::si);\n"
" foo(c.ip);\n"
" foo(c.fp);\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
@ -3710,6 +3712,12 @@ private:
f = Token::findsimplematch(tokenizer.tokens(), "foo ( C :: si ) ;"); f = Token::findsimplematch(tokenizer.tokens(), "foo ( C :: si ) ;");
ASSERT_EQUALS(true, f && f->function() && f->function()->tokenDef->linenr() == 3); ASSERT_EQUALS(true, f && f->function() && f->function()->tokenDef->linenr() == 3);
f = Token::findsimplematch(tokenizer.tokens(), "foo ( c . ip ) ;");
ASSERT_EQUALS(true, f && f->function() && f->function()->tokenDef->linenr() == 4);
f = Token::findsimplematch(tokenizer.tokens(), "foo ( c . fp ) ;");
ASSERT_EQUALS(true, f && f->function() == nullptr);
} }