Fixed danmar#2321 (false positive: (performance) Prefer prefix ++/-- operators for non-primitive types.)

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit 7ec169f66ab6 · 2010-12-30T14:27:32.000+01:00
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
@@ -74,6 +74,9 @@ void CheckPostfixOperator::postfixOperator()
         if (result && tok->previous()->varId())
         {
             const Token *decltok = Token::findmatch(_tokenizer->tokens(), "%varid%", tok->previous()->varId());
+            if (!Token::Match(decltok->tokAt(-1), "%type%"))
+                continue;
+
             if (decltok && Token::Match(decltok->previous(), "iterator|const_iterator|reverse_iterator|const_reverse_iterator"))
             {
                 // the variable is an iterator
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
@@ -69,6 +69,7 @@ class TestPostfixOperator : public TestFixture
         TEST_CASE(testvolatile);
         TEST_CASE(testiterator);
         TEST_CASE(test2168);
+        TEST_CASE(pointer);   // #2321 - postincrement of pointer is OK
     }
 
     void testsimple()
@@ -372,6 +373,14 @@ class TestPostfixOperator : public TestFixture
               "int main(){}\n");
         ASSERT_EQUALS("", errout.str());
     }
+
+    void pointer()
+    {
+        check("static struct class * ab;\n"
+              "int * p;\n"
+              "p++;\n");
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(TestPostfixOperator)

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ void CheckPostfixOperator::postfixOperator()`
`74`	`74`	`if (result && tok->previous()->varId())`
`75`	`75`	`{`
`76`	`76`	`const Token *decltok = Token::findmatch(_tokenizer->tokens(), "%varid%", tok->previous()->varId());`
	`77`	`+ if (!Token::Match(decltok->tokAt(-1), "%type%"))`
	`78`	`+ continue;`
	`79`	`+`
`77`	`80`	`if (decltok && Token::Match(decltok->previous(), "iterator\|const_iterator\|reverse_iterator\|const_reverse_iterator"))`
`78`	`81`	`{`
`79`	`82`	`// the variable is an iterator`