Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions lib/symboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6830,20 +6830,27 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
return ValueType::MatchResult::UNKNOWN; // TODO
}

if (call->typeScope != nullptr || func->typeScope != nullptr)
return call->typeScope == func->typeScope ? ValueType::MatchResult::SAME : ValueType::MatchResult::NOMATCH;
if (call->typeScope != nullptr || func->typeScope != nullptr) {
if (call->typeScope != func->typeScope)
return ValueType::MatchResult::NOMATCH;
}

if (call->container != nullptr || func->container != nullptr) {
if (call->container != func->container)
return ValueType::MatchResult::NOMATCH;
}

else if (func->type < ValueType::Type::VOID || func->type == ValueType::Type::UNKNOWN_INT)
return ValueType::MatchResult::UNKNOWN;
if (func->typeScope != nullptr && func->container != nullptr) {
if (func->type < ValueType::Type::VOID || func->type == ValueType::Type::UNKNOWN_INT)
return ValueType::MatchResult::UNKNOWN;
}

if (call->isIntegral() && func->isIntegral() && call->sign != ValueType::Sign::UNKNOWN_SIGN && func->sign != ValueType::Sign::UNKNOWN_SIGN && call->sign != func->sign)
return ValueType::MatchResult::FALLBACK1;

if (func->reference != Reference::None && func->constness > call->constness)
return ValueType::MatchResult::FALLBACK1;

return ValueType::MatchResult::SAME;
}

Expand Down
47 changes: 47 additions & 0 deletions test/testsymboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,8 @@ class TestSymbolDatabase: public TestFixture {
TEST_CASE(findFunction38); // #10125
TEST_CASE(findFunction39); // #10127
TEST_CASE(findFunction40); // #10135
TEST_CASE(findFunction41); // #10202
TEST_CASE(findFunction42);
TEST_CASE(findFunctionContainer);
TEST_CASE(findFunctionExternC);
TEST_CASE(findFunctionGlobalScope); // ::foo
Expand Down Expand Up @@ -6378,6 +6380,51 @@ class TestSymbolDatabase: public TestFixture {
ASSERT_EQUALS(3, functok->function()->tokenDef->linenr());
}

void findFunction41() { // #10202
{
GET_SYMBOL_DB("struct A {};\n"
"const int* g(const A&);\n"
"int* g(A&);\n"
"void f(A& x) {\n"
" int* y = g(x);\n"
" *y = 0;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( x )");
ASSERT(functok);
ASSERT(functok->function());
ASSERT(functok->function()->name() == "g");
ASSERT_EQUALS(3, functok->function()->tokenDef->linenr());
}
{
GET_SYMBOL_DB("struct A {};\n"
"const int* g(const A&);\n"
"int* g(A&);\n"
"void f(const A& x) {\n"
" int* y = g(x);\n"
" *y = 0;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( x )");
ASSERT(functok);
ASSERT(functok->function());
ASSERT(functok->function()->name() == "g");
ASSERT_EQUALS(2, functok->function()->tokenDef->linenr());
}
}

void findFunction42() {
GET_SYMBOL_DB("void a(const std::string &, const std::string &);\n"
"void a(long, long);\n"
"void b() { a(true, false); }\n");
ASSERT_EQUALS("", errout.str());
const Token *functok = Token::findsimplematch(tokenizer.tokens(), "a ( true , false )");
ASSERT(functok);
ASSERT(functok->function());
ASSERT(functok->function()->name() == "a");
ASSERT_EQUALS(2, functok->function()->tokenDef->linenr());
}

void findFunctionContainer() {
{
GET_SYMBOL_DB("void dostuff(std::vector<int> v);\n"
Expand Down