Fix #13816 FN uninitMemberVar with union (regression)

Author: web-flow

lib/checkclass.cpp

@@ -174,13 +174,13 @@ void CheckClass::constructors()
 
         // #3196 => bailout if there are nested unions
         // TODO: handle union variables better
-        {
-            const bool bailout = std::any_of(scope->nestedList.cbegin(), scope->nestedList.cend(), [](const Scope* nestedScope) {
-                return nestedScope->type == ScopeType::eUnion;
-            });
-            if (bailout)
-                continue;
-        }
+        // {
+        //     const bool bailout = std::any_of(scope->nestedList.cbegin(), scope->nestedList.cend(), [](const Scope* nestedScope) {
+        //         return nestedScope->type == ScopeType::eUnion;
+        //     });
+        //     if (bailout)
+        //         continue;
+        // }
 
 
         std::vector<Usage> usageList = createUsageList(scope);
@@ -311,7 +311,7 @@ void CheckClass::constructors()
                     if (!precedes(scope->bodyStart, func.tokenDef))
                         continue;
                     const Scope *varType = var.typeScope();
-                    if (!varType || varType->type != ScopeType::eUnion) {
+                     {
                         const bool derived = scope != var.scope();
                         if (func.type == FunctionType::eConstructor &&
                             func.nestedIn && (func.nestedIn->numConstructors - func.nestedIn->numCopyOrMoveConstructors) > 1 &&

test/testconstructors.cpp

@@ -1302,7 +1302,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "};");
-        TODO_ASSERT_EQUALS("[test.cpp:9]: (warning) Member variable 'Fred::U' is not initialized in the constructor.\n", "", errout_str());
+        ASSERT_EQUALS("[test.cpp:9]: (warning) Member variable 'Fred::U' is not initialized in the constructor.\n", errout_str());
     }
 
 
@@ -3428,9 +3428,6 @@ class TestConstructors : public TestFixture {
     }
 
     void uninitVarUnion2() {
-        // If the "data_type" is 0 it means union member "data" is invalid.
-        // So it's ok to not initialize "data".
-        // related forum: http://sourceforge.net/apps/phpbb/cppcheck/viewtopic.php?f=3&p=1806
         check("union Data { int id; int *ptr; };\n"
               "\n"
               "class Fred {\n"
@@ -3441,7 +3438,7 @@ class TestConstructors : public TestFixture {
               "    Fred() : data_type(0)\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:8]: (warning) Member variable 'Fred::data' is not initialized in the constructor.\n", errout_str());
     }
 
     void uninitMissingFuncDef() {