unused struct members: don't warn about packed structs (danmar#3088)

danmar · danmar · commit ac1a869d6089 · 2016-09-05T17:27:12.000+02:00
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1240,6 +1240,10 @@ void CheckUnusedVar::checkStructMemberUsage()
         if (scope->classStart->fileIndex() != 0 || scope->className.empty())
             continue;
 
+        // Packed struct => possibly used by lowlevel code. Struct members might be required by hardware.
+        if (scope->classEnd->isAttributePacked())
+            continue;
+
         // Bail out if struct/union contains any functions
         if (!scope->functionList.empty())
             continue;
diff --git a/lib/token.h b/lib/token.h
@@ -386,6 +386,12 @@ class CPPCHECKLIB Token {
     void isAttributeNothrow(bool value) {
         setFlag(fIsAttributeNothrow, value);
     }
+    bool isAttributePacked() const {
+        return getFlag(fIsAttributePacked);
+    }
+    void isAttributePacked(bool value) {
+        setFlag(fIsAttributePacked, value);
+    }
     bool isOperatorKeyword() const {
         return getFlag(fIsOperatorKeyword);
     }
@@ -838,9 +844,10 @@ class CPPCHECKLIB Token {
         fIsAttributeNoreturn    = (1 << 12), // __attribute__((noreturn)), __declspec(noreturn)
         fIsAttributeNothrow     = (1 << 13), // __attribute__((nothrow)), __declspec(nothrow)
         fIsAttributeUsed        = (1 << 14), // __attribute__((used))
-        fIsOperatorKeyword      = (1 << 15), // operator=, etc
-        fIsComplex              = (1 << 16), // complex/_Complex type
-        fIsEnumType             = (1 << 17)  // enumeration type
+        fIsAttributePacked      = (1 << 15), // __attribute__((packed))
+        fIsOperatorKeyword      = (1 << 16), // operator=, etc
+        fIsComplex              = (1 << 17), // complex/_Complex type
+        fIsEnumType             = (1 << 18)  // enumeration type
     };
 
     unsigned int _flags;
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8585,6 +8585,10 @@ void Tokenizer::simplifyAttribute()
                 }
             }
 
+            else if (Token::simpleMatch(tok->previous(), "} __attribute__ ( ( packed )")) {
+                tok->previous()->isAttributePacked(true);
+            }
+
             Token::eraseTokens(tok, tok->next()->link()->next());
             tok->deleteThis();
         }
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
@@ -48,6 +48,7 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(structmember10);
         TEST_CASE(structmember11); // #4168 - initialization with {} / passed by address to unknown function
         TEST_CASE(structmember12); // #7179 - FP unused structmember
+        TEST_CASE(structmember13); // #3088 - __attribute__((packed))
         TEST_CASE(structmember_sizeof);
 
         TEST_CASE(localvar1);
@@ -422,6 +423,13 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
+    void structmember13() { // #3088 - struct members required by hardware
+        checkStructMemberUsage("struct S {\n"
+                               "  int x;\n"
+                               "} __attribute__((packed));");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void structmember_extern() {
         // extern struct => no false positive
         checkStructMemberUsage("extern struct AB\n"

Original file line number	Diff line number	Diff line change
`@@ -8585,6 +8585,10 @@ void Tokenizer::simplifyAttribute()`
`8585`	`8585`	`}`
`8586`	`8586`	`}`
`8587`	`8587`
	`8588`	`+ else if (Token::simpleMatch(tok->previous(), "} __attribute__ ( ( packed )")) {`
	`8589`	`+ tok->previous()->isAttributePacked(true);`
	`8590`	`+ }`
	`8591`	`+`
`8588`	`8592`	`Token::eraseTokens(tok, tok->next()->link()->next());`
`8589`	`8593`	`tok->deleteThis();`
`8590`	`8594`	`}`