Update symboldatabase.cpp [skip ci]

Author: chrchr-github

lib/symboldatabase.cpp

@@ -8702,10 +8702,10 @@ static Result accumulateStructMembers(const Scope* scope, F f, ValueType::Accura
             });
             if (vt->container && vt->container->startPattern == "std :: array <") {
                 const ValueType vtElement = ValueType::parseDecl(vt->containerTypeToken, settings);
-                total = f(total, vtElement, dim, bits);
+                total = f(total, vtElement, dim, bits, /*isAnonUnion*/ false);
             }
             else
-                total = f(total, *vt, dim, bits);
+                total = f(total, *vt, dim, bits, var.nameToken()->scope() != scope);
         }
         if (accuracy == ValueType::Accuracy::ExactOrZero && total == 0 && bits == -1)
             return {0, false};
@@ -8739,7 +8739,7 @@ static size_t getAlignOf(const ValueType& vt, const Settings& settings, ValueTyp
         return align == 0 ? 0 : bitCeil(align);
     }
     if (vt.type == ValueType::Type::RECORD && vt.typeScope) {
-        auto accHelper = [&](size_t max, const ValueType& vt2, size_t /*dim*/, MathLib::bigint /*bits*/) {
+        auto accHelper = [&](size_t max, const ValueType& vt2, size_t /*dim*/, MathLib::bigint /*bits*/, bool /*isAnonUnion*/) {
             size_t a = getAlignOf(vt2, settings, accuracy, ValueType::SizeOf::Pointer, ++maxRecursion);
             return std::max(max, a);
         };
@@ -8791,7 +8791,7 @@ size_t ValueType::getSizeOf( const Settings& settings, Accuracy accuracy, SizeOf
     if (type == ValueType::Type::RECORD && typeScope) {
         size_t currentBitCount = 0;
         size_t currentBitfieldAlloc = 0;
-        auto accHelper = [&](size_t total, const ValueType& vt2, size_t dim, MathLib::bigint nBits) -> size_t {
+        auto accHelper = [&](size_t total, const ValueType& vt2, size_t dim, MathLib::bigint nBits, bool isAnonUnion) -> size_t {
             const size_t charBit = settings.platform.char_bit;
             size_t n = vt2.getSizeOf(settings, accuracy, SizeOf::Pointer, ++maxRecursion);
             size_t a = getAlignOf(vt2, settings, accuracy, SizeOf::Pointer);
@@ -8834,7 +8834,7 @@ size_t ValueType::getSizeOf( const Settings& settings, Accuracy accuracy, SizeOf
                 currentBitfieldAlloc = 0;
                 currentBitCount = 0;
             }
-            const bool isUnion = typeScope->type == ScopeType::eUnion || (vt2.typeScope && vt2.typeScope->nestedIn->type == ScopeType::eUnion && vt2.typeScope->nestedIn->className.empty());
+            const bool isUnion = isAnonUnion || typeScope->type == ScopeType::eUnion;
             return isUnion ? std::max(total, n) : total + padding + n;
         };
         Result result = accumulateStructMembers(typeScope, accHelper, accuracy, settings);