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

Fixed #11904 (One more related fix for Scope::findFunction) (#5383)

This commit is contained in:
Daniel Marjamäki 2023-08-31 23:12:54 +02:00 committed by GitHub
parent 44c149e51b
commit 85332b2af6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/symboldatabase.cpp
View File

@ -5688,21 +5688,25 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
return matches[0]; return matches[0];
// Prioritize matches in derived scopes // Prioritize matches in derived scopes
for (const auto& fb : { fallback1Func, fallback2Func }) {
const Function* ret = nullptr; const Function* ret = nullptr;
for (int i = 0; i < fallback1Func.size(); ++i) { for (int i = 0; i < fb.size(); ++i) {
if (std::find(matches.cbegin(), matches.cend(), fallback1Func[i]) == matches.cend()) if (std::find(matches.cbegin(), matches.cend(), fb[i]) == matches.cend())
continue; continue;
if (this == fallback1Func[i]->nestedIn) { if (this == fb[i]->nestedIn) {
if (!ret) if (!ret)
ret = fallback1Func[i]; ret = fb[i];
else { else {
ret = nullptr; ret = nullptr;
break; break;
} }
} }
} }
if (ret)
return ret; return ret;
}
return nullptr;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

11
test/testsymboldatabase.cpp
View File

@ -7306,6 +7306,7 @@ private:
} }
void findFunction50() { void findFunction50() {
{
GET_SYMBOL_DB("struct B { B(); void init(unsigned int value); };\n" GET_SYMBOL_DB("struct B { B(); void init(unsigned int value); };\n"
"struct D: B { D(); void init(unsigned int value); };\n" "struct D: B { D(); void init(unsigned int value); };\n"
"D::D() { init(0); }\n" "D::D() { init(0); }\n"
@ -7314,6 +7315,16 @@ private:
ASSERT(call && call->function() && call->function()->functionScope); ASSERT(call && call->function() && call->function()->functionScope);
} }
{
GET_SYMBOL_DB("struct B { B(); void init(unsigned int value); };\n"
"struct D: B { D(); void init(unsigned int value); };\n"
"D::D() { init(0ULL); }\n"
"void D::init(unsigned int value) {}\n");
const Token* call = Token::findsimplematch(tokenizer.tokens(), "init ( 0ULL ) ;");
ASSERT(call && call->function() && call->function()->functionScope);
}
}
void findFunctionContainer() { void findFunctionContainer() {
{ {
GET_SYMBOL_DB("void dostuff(std::vector<int> v);\n" GET_SYMBOL_DB("void dostuff(std::vector<int> v);\n"