Fix #12395 debug: SymbolDatabase couldn't resolve all user defined ty…

…pes with static member (danmar#5929)
chrchr-github · Jan 31, 2024 · f403177 · f403177
1 parent a1b1293
commit f403177
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -937,6 +937,8 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                         bool unknown = false;
 
                         for (const Variable& var: scope.varlist) {
+                            if (var.isStatic())
+                                continue;
                             if (var.isClass() && !var.isReference()) {
                                 if (var.type()) {
                                     // does this type need initialization?
@@ -947,7 +949,7 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                                             unknown = true;
                                     }
                                 }
-                            } else if (!var.hasDefault() && !var.isStatic()) {
+                            } else if (!var.hasDefault()) {
                                 needInitialization = true;
                                 break;
                             }

diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -3034,6 +3034,14 @@ class TestSymbolDatabase : public TestFixture {
                               "};\n");
             ASSERT_EQUALS("", errout.str());
         }
+        {
+            GET_SYMBOL_DB_DBG("struct S {\n" // #12395
+                              "    static S s;\n"
+                              "};\n");
+            ASSERT_EQUALS("", errout.str());
+            const Variable* const s = db->getVariableFromVarId(1);
+            ASSERT(s->scope()->definedType->needInitialization == Type::NeedInitialization::False);
+        }
     }
 
     void tryCatch1() {