Fix #11888 FP knownPointerToBool with incorrect overload match

chrchr-github · Aug 21, 2023 · 869af84 · 869af84
1 parent 03b952d
commit 869af84
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -7686,7 +7686,7 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
     }
 
     if (call->typeScope != nullptr || func->typeScope != nullptr) {
-        if (call->typeScope != func->typeScope)
+        if (call->typeScope != func->typeScope && !(call->typeScope->definedType && call->typeScope->definedType->isDerivedFrom(func->typeScope->className)))
             return ValueType::MatchResult::NOMATCH;
     }
 

diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -441,6 +441,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(findFunction46);
         TEST_CASE(findFunction47);
         TEST_CASE(findFunction48);
+        TEST_CASE(findFunction49); // #11888
         TEST_CASE(findFunctionContainer);
         TEST_CASE(findFunctionExternC);
         TEST_CASE(findFunctionGlobalScope); // ::foo
@@ -7286,6 +7287,22 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(1, typeTok->type()->classDef->linenr());
     }
 
+    void findFunction49() {
+        GET_SYMBOL_DB("struct B {};\n"
+                      "struct D : B {};\n"
+                      "void f(bool = false, bool = true);\n"
+                      "void f(B*, bool, bool = true);\n"
+                      "void g() {\n"
+                      "    D d;\n"
+                      "    f(&d, true);\n"
+                      "}\n");
+        ASSERT_EQUALS("", errout.str());
+        const Token* ftok = Token::findsimplematch(tokenizer.tokens(), "f ( &");
+        ASSERT(ftok && ftok->function());
+        ASSERT(ftok->function()->name() == "f");
+        ASSERT_EQUALS(4, ftok->function()->tokenDef->linenr());
+    }
+
     void findFunctionContainer() {
         {
             GET_SYMBOL_DB("void dostuff(std::vector<int> v);\n"