unsigned division: don't warn about 'unsigned char' because it is promoted to int.

danmar · danmar · commit bc6d31c7c75f · 2013-01-30T16:50:12.000+01:00
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1808,11 +1808,11 @@ void CheckOther::unreachableCodeError(const Token *tok, bool inconclusive)
 //---------------------------------------------------------------------------
 // Check for unsigned divisions
 //---------------------------------------------------------------------------
-static bool isUnsigned(const Variable* var)
+bool CheckOther::isUnsigned(const Variable* var) const
 {
-    return(var && var->typeStartToken()->isUnsigned() && !var->isPointer() && !var->isArray());
+    return(var && var->typeStartToken()->isUnsigned() && !var->isPointer() && !var->isArray() && _tokenizer->sizeOfType(var->typeStartToken()) >= _settings->sizeof_int);
 }
-static bool isSigned(const Variable* var)
+bool CheckOther::isSigned(const Variable* var) const
 {
     return(var && !var->typeStartToken()->isUnsigned() && Token::Match(var->typeEndToken(), "int|char|short|long") && !var->isPointer() && !var->isArray());
 }
diff --git a/lib/checkother.h b/lib/checkother.h
@@ -294,6 +294,9 @@ class CPPCHECKLIB CheckOther : public Check {
     void checkVarFuncNullUB();
 
 private:
+    bool isUnsigned(const Variable *var) const;
+    bool isSigned(const Variable *var) const;
+
     // Error messages..
     void oppositeInnerConditionError(const Token *tok);
     void clarifyCalculationError(const Token *tok, const std::string &op);
diff --git a/test/testdivision.cpp b/test/testdivision.cpp
@@ -63,6 +63,7 @@ class TestDivision : public TestFixture {
         TEST_CASE(division8);
         TEST_CASE(division9);
         TEST_CASE(division10);
+        TEST_CASE(division11);  // no error when using "unsigned char" (it is promoted)
     }
 
     void division1() {
@@ -197,6 +198,13 @@ class TestDivision : public TestFixture {
         check("i / i", true);
         ASSERT_EQUALS("", errout.str());
     }
+
+    void division11() {
+        check("void f(int x, unsigned char y) {\n"
+              "    int z = x / y;\n"  // no error, y is promoted
+              "}", true);
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(TestDivision)

Original file line number	Diff line number	Diff line change
`@@ -1808,11 +1808,11 @@ void CheckOther::unreachableCodeError(const Token *tok, bool inconclusive)`
`1808`	`1808`	`//---------------------------------------------------------------------------`
`1809`	`1809`	`// Check for unsigned divisions`
`1810`	`1810`	`//---------------------------------------------------------------------------`
`1811`		`-static bool isUnsigned(const Variable* var)`
	`1811`	`+bool CheckOther::isUnsigned(const Variable* var) const`
`1812`	`1812`	`{`
`1813`		`- return(var && var->typeStartToken()->isUnsigned() && !var->isPointer() && !var->isArray());`
	`1813`	`+ return(var && var->typeStartToken()->isUnsigned() && !var->isPointer() && !var->isArray() && _tokenizer->sizeOfType(var->typeStartToken()) >= _settings->sizeof_int);`
`1814`	`1814`	`}`
`1815`		`-static bool isSigned(const Variable* var)`
	`1815`	`+bool CheckOther::isSigned(const Variable* var) const`
`1816`	`1816`	`{`
`1817`	`1817`	`return(var && !var->typeStartToken()->isUnsigned() && Token::Match(var->typeEndToken(), "int\|char\|short\|long") && !var->isPointer() && !var->isArray());`
`1818`	`1818`	`}`