account for bit-fields with greater number of bits than its type

Author: ludviggunne

lib/token.h

@@ -82,7 +82,7 @@ struct TokenImpl {
     nonneg int mIndex{};
 
     /** Bitfield bit count. */
-    char mBits = -1;
+    MathLib::bigint mBits = -1;
 
     // AST..
     Token* mAstOperand1{};
@@ -753,7 +753,7 @@ class CPPCHECKLIB Token {
     bool isBitfield() const {
         return mImpl->mBits >= 0;
     }
-    char bits() const {
+    MathLib::bigint bits() const {
         return mImpl->mBits;
     }
     const std::set<TemplateSimplifier::TokenAndName*>* templateSimplifierPointers() const {
@@ -767,7 +767,7 @@ class CPPCHECKLIB Token {
             mImpl->mTemplateSimplifierPointers = new std::set<TemplateSimplifier::TokenAndName*>;
         mImpl->mTemplateSimplifierPointers->insert(tokenAndName);
     }
-    void setBits(const unsigned char b) {
+    void setBits(const MathLib::bigint b) {
         mImpl->mBits = b;
     }
 

lib/tokenize.cpp

@@ -10015,7 +10015,7 @@ void Tokenizer::simplifyBitfields()
             !Token::simpleMatch(tok->tokAt(2), "default :")) {
             Token *tok1 = typeTok->next();
             if (Token::Match(tok1, "%name% : %num% [;=]"))
-                tok1->setBits(static_cast<char>(MathLib::toBigNumber(tok1->tokAt(2))));
+                tok1->setBits(MathLib::toBigNumber(tok1->tokAt(2)));
             if (tok1 && tok1->tokAt(2) &&
                 (Token::Match(tok1->tokAt(2), "%bool%|%num%") ||
                  !Token::Match(tok1->tokAt(2), "public|protected|private| %type% ::|<|,|{|;"))) {
@@ -10041,9 +10041,9 @@ void Tokenizer::simplifyBitfields()
             Token *newTok = typeTok->insertToken(name);
             newTok->isAnonymousBitfield(true);
             if (newTok->tokAt(2)->isBoolean())
-                newTok->setBits(static_cast<char>(newTok->strAt(2) == "true"));
+                newTok->setBits(newTok->strAt(2) == "true");
             else
-                newTok->setBits(static_cast<char>(MathLib::toBigNumber(newTok->tokAt(2))));
+                newTok->setBits(MathLib::toBigNumber(newTok->tokAt(2)));
             newTok->deleteNext(2);
         }
 

lib/valueflow.cpp

@@ -440,7 +440,7 @@ static Result accumulateStructMembers(const Scope* scope, F f, ValueFlow::Accura
     for (const Variable& var : scope->varlist) {
         if (var.isStatic())
             continue;
-        const char bits = var.nameToken() ? var.nameToken()->bits() : -1;
+        const MathLib::bigint bits = var.nameToken() ? var.nameToken()->bits() : -1;
         if (const ValueType* vt = var.valueType()) {
             if (vt->type == ValueType::Type::RECORD && vt->typeScope == scope)
                 return {0, false};
@@ -537,7 +537,7 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, Accur
     if (vt.type == ValueType::Type::RECORD && vt.typeScope) {
         size_t currentBitCount = 0;
         size_t currentBitfieldAlloc = 0;
-        auto accHelper = [&](size_t total, const ValueType& vt2, size_t dim, char bits) -> size_t {
+        auto accHelper = [&](size_t total, const ValueType& vt2, size_t dim, MathLib::bigint bits) -> size_t {
             const size_t charBit = settings.platform.char_bit;
             size_t n = ValueFlow::getSizeOf(vt2, settings,accuracy, ++maxRecursion);
             size_t a = getAlignOf(vt2, settings, accuracy);
@@ -558,6 +558,10 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, Accur
                     currentBitfieldAlloc = n;
                     currentBitCount = 0;
                 }
+                while (bits > charBit * currentBitfieldAlloc) {
+                    ret += currentBitfieldAlloc;
+                    bits -= charBit * currentBitfieldAlloc;
+                }
                 currentBitCount += bits;
                 return ret;
             }