Check64Bit: Fixed false positive about returning integer for 'p+(n*80)'

danmar · danmar · commit 4f88fdcf4ac4 · 2013-10-08T06:36:45.000+02:00
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -74,7 +74,11 @@ void Check64BitPortability::pointerassignment()
                         type = INT;
                     else if (type == PTR && Token::Match(tok2, "- %var%") && isaddr(tok2->next()->variable()))
                         type = PTRDIFF;
-                    else if (Token::Match(tok2, "%type% (")) {
+                    else if (Token::Match(tok2, "(")) {
+                        type = NO;
+                        break;
+                    } else if (tok2->str() == "(") {
+                        // TODO: handle parentheses
                         type = NO;
                         break;
                     } else if (type == PTR && Token::simpleMatch(tok2, "."))
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -193,6 +193,12 @@ class Test64BitPortability : public TestFixture {
               " return 1 + p->i;\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("static void __iomem *f(unsigned int port_no) {\n"
+              "  void __iomem *mmio = hpriv->mmio;\n"
+              "  return mmio + (port_no * 0x80);\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 };
 
