fix #13954

Author: ludviggunne

lib/checkunusedvar.cpp

@@ -1575,6 +1575,9 @@ void CheckUnusedVar::checkStructMemberUsage()
             if (isInherited && !var.isPrivate())
                 continue;
 
+            if (var.nameToken() && var.nameToken()->isAttributeUnused())
+                continue;
+
             if (mTokenizer->isVarUsedInTemplate(var.declarationId()))
                 continue;
 

lib/tokenize.cpp

@@ -9970,12 +9970,8 @@ void Tokenizer::simplifyAt()
 // Simplify bitfields
 void Tokenizer::simplifyBitfields()
 {
-    bool goback = false;
+    std::size_t anonymousBitfieldCounter = 0;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (goback) {
-            goback = false;
-            tok = tok->previous();
-        }
         Token *last = nullptr;
 
         if (Token::simpleMatch(tok, "for ("))
@@ -10025,8 +10021,15 @@ void Tokenizer::simplifyBitfields()
             }
         } else if (Token::Match(typeTok, "%type% : %num%|%bool% ;") &&
                    typeTok->str() != "default") {
-            tok->deleteNext(4 + tokDistance(tok, typeTok) - 1);
-            goback = true;
+            const std::size_t id = anonymousBitfieldCounter++;
+            const std::string name = "__cppcheck_anon_bit_field_" + std::to_string(id) + "__";
+            Token *newTok = typeTok->insertToken(name);
+            newTok->isAttributeUnused(true);
+            if (newTok->tokAt(2)->isBoolean())
+                newTok->setBits(static_cast<unsigned char>(newTok->tokAt(2)->str() == "true"));
+            else
+                newTok->setBits(static_cast<unsigned char>(MathLib::toBigNumber(newTok->tokAt(2))));
+            newTok->deleteNext(2);
         }
 
         if (last && last->str() == ",") {