Fix struct typescope for C code in dumpfile

Author: swasti16

lib/symboldatabase.cpp

@@ -6571,23 +6571,6 @@ const Type* SymbolDatabase::findType(const Token *startTok, const Scope *startSc
     if (startTok->str() == startScope->className && startScope->isClassOrStruct() && startTok->strAt(1) != "::")
         return startScope->definedType;
 
-    if (startTok->isC()) {
-        const Scope* scope = startScope;
-        while (scope) {
-            if (startTok->str() == scope->className && scope->isClassOrStruct())
-                return scope->definedType;
-            const Scope* typeScope = scope->findRecordInNestedList(startTok->str(), /*isC*/ true);
-            if (typeScope) {
-                if (startTok->str() == typeScope->className && typeScope->isClassOrStruct()) {
-                    if (const Type* type = typeScope->definedType)
-                        return type;
-                }
-            }
-            scope = scope->nestedIn;
-        }
-        return nullptr;
-    }
-
     const Scope* start_scope = startScope;
 
     // absolute path - directly start in global scope

test/cfg/gtk.c

@@ -292,7 +292,6 @@ void g_new_if_test()
     };
 
     const struct a * pNew3;
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     if (pNew3 = g_new(struct a, 6)) {
         printf("%p", pNew3);
     }
@@ -305,7 +304,6 @@ void g_new0_test()
         int b;
     };
     // valid
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     struct a * pNew1 = g_new0(struct a, 5);
     printf("%p", pNew1);
     g_free(pNew1);
@@ -324,7 +322,6 @@ void g_try_new_test()
         int b;
     };
     // valid
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     struct a * pNew1 = g_try_new(struct a, 5);
     printf("%p", pNew1);
     g_free(pNew1);
@@ -342,7 +339,6 @@ void g_try_new0_test()
         int b;
     };
     // valid
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     struct a * pNew1 = g_try_new0(struct a, 5);
     printf("%p", pNew1);
     g_free(pNew1);
@@ -360,7 +356,7 @@ void g_renew_test()
     struct a {
         int b;
     };
-    // cppcheck-suppress [leakReturnValNotUsed,valueFlowBailoutIncompleteVar]
+    // cppcheck-suppress leakReturnValNotUsed
     g_renew(struct a, NULL, 1);
 
     struct a * pNew = g_new(struct a, 1);
@@ -375,7 +371,7 @@ void g_try_renew_test()
     struct a {
         int b;
     };
-    // cppcheck-suppress [leakReturnValNotUsed,valueFlowBailoutIncompleteVar]
+    // cppcheck-suppress leakReturnValNotUsed
     g_try_renew(struct a, NULL, 1);
 
     struct a * pNew = g_try_new(struct a, 1);

test/testsymboldatabase.cpp

@@ -619,6 +619,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(incomplete_type); // #9255 (infinite recursion)
         TEST_CASE(exprIds);
         TEST_CASE(testValuetypeOriginalName);
+        TEST_CASE(testValueTypeTypeScope);
 
         TEST_CASE(dumpFriend); // Check if isFriend added to dump file
 
@@ -11318,6 +11319,28 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void testValueTypeTypeScope() {
+        GET_SYMBOL_DB_C("struct deer {\n"
+                        "   uint16_t a;\n"
+                        "   uint16_t b;\n"
+                        "};\n"
+                        "void herd ( void ) {\n"
+                        "   struct deer {\n"
+                        "     uint16_t a;\n"
+                        "   };\n"
+                        "}");
+
+        ASSERT_EQUALS("", errout_str());
+
+        const Token* f = Token::findsimplematch(tokenizer.tokens(), "struct deer {");
+        ASSERT(db && f && f->tokAt(2) && f->tokAt(2)->valueType());
+        ASSERT_EQUALS(f->tokAt(2)->scope(), f->tokAt(2)->valueType()->typeScope);
+
+        f = Token::findsimplematch(tokenizer.tokens(), "{ struct deer {");
+        ASSERT(f && f->tokAt(3) && f->tokAt(3)->valueType());
+        ASSERT_EQUALS(f->tokAt(3)->scope(), f->tokAt(3)->valueType()->typeScope);
+    }
+
     void dumpFriend() {
         GET_SYMBOL_DB("class Foo {\n"
                       "    Foo();\n"