Fix #13310: SymbolDatabase: function pointer is set on enum constant (danmar#7037)

ludviggunne · web-flow · commit 61b75e64ea5d · 2024-11-25T09:48:46.000+01:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -5993,6 +5993,9 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
 
 const Function* SymbolDatabase::findFunction(const Token* const tok) const
 {
+    if (tok->tokType() == Token::Type::eEnumerator)
+        return nullptr;
+
     // find the scope this function is in
     const Scope *currScope = tok->scope();
     while (currScope && currScope->isExecutable()) {
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -521,6 +521,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(findFunction55); // #13004
         TEST_CASE(findFunction56);
         TEST_CASE(findFunction57);
+        TEST_CASE(findFunction58); // #13310
         TEST_CASE(findFunctionRef1);
         TEST_CASE(findFunctionRef2); // #13328
         TEST_CASE(findFunctionContainer);
@@ -8376,6 +8377,19 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(T->function()->tokenDef->linenr(), 6);
     }
 
+    void findFunction58() { // #13310
+        GET_SYMBOL_DB("class C {\n"
+                      "    enum class abc : uint8_t {\n"
+                      "        a,b,c\n"
+                      "    };\n"
+                      "    void a();\n"
+                      "};\n");
+        const Token *a1 = Token::findsimplematch(tokenizer.tokens(), "a ,");
+        ASSERT(a1 && !a1->function());
+        const Token *a2 = Token::findsimplematch(tokenizer.tokens(), "a (");
+        ASSERT(a2 && a2->function());
+    }
+
     void findFunctionRef1() {
         GET_SYMBOL_DB("struct X {\n"
                       "    const std::vector<int> getInts() const & { return mInts; }\n"

Original file line number	Diff line number	Diff line change
`@@ -5993,6 +5993,9 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen`
`5993`	`5993`
`5994`	`5994`	`const Function* SymbolDatabase::findFunction(const Token* const tok) const`
`5995`	`5995`	`{`
	`5996`	`+ if (tok->tokType() == Token::Type::eEnumerator)`
	`5997`	`+ return nullptr;`
	`5998`	`+`
`5996`	`5999`	`// find the scope this function is in`
`5997`	`6000`	`const Scope *currScope = tok->scope();`
`5998`	`6001`	`while (currScope && currScope->isExecutable()) {`