Fix #14064 Files are reanalyzed with --cppcheck-build-dir and inline suppressions (regression) (danmar#7741)

Author: chrchr-github

lib/cppcheck.cpp

@@ -859,7 +859,7 @@ static simplecpp::TokenList createTokenList(const std::string& filename, std::ve
     return {filename, files, outputList};
 }
 
-std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const simplecpp::TokenList& tokens) const
+std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const simplecpp::TokenList& tokens, const std::string& filePath) const
 {
     std::ostringstream toolinfo;
     toolinfo << (mSettings.cppcheckCfgProductName.empty() ? CPPCHECK_VERSION_STRING : mSettings.cppcheckCfgProductName);
@@ -876,7 +876,7 @@ std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const simp
     }
     toolinfo << mSettings.premiumArgs;
     // TODO: do we need to add more options?
-    mSuppressions.nomsg.dump(toolinfo);
+    mSuppressions.nomsg.dump(toolinfo, filePath);
     return preprocessor.calculateHash(tokens, toolinfo.str());
 }
 
@@ -1029,7 +1029,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
 
         if (analyzerInformation) {
             // Calculate hash so it can be compared with old hash / future hashes
-            const std::size_t hash = calculateHash(preprocessor, tokens1);
+            const std::size_t hash = calculateHash(preprocessor, tokens1, file.spath());
             std::list<ErrorMessage> errors;
             if (!analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors)) {
                 while (!errors.empty()) {

lib/cppcheck.h

@@ -172,7 +172,7 @@ class CPPCHECKLIB CppCheck {
      * @param tokens        Token list from preprocessed file.
      * @return hash
      */
-    std::size_t calculateHash(const Preprocessor &preprocessor, const simplecpp::TokenList &tokens) const;
+    std::size_t calculateHash(const Preprocessor &preprocessor, const simplecpp::TokenList &tokens, const std::string& filePath = {}) const;
 
     /**
      * @brief Check a file using stream

lib/suppressions.cpp

@@ -512,12 +512,14 @@ bool SuppressionList::isSuppressed(const ::ErrorMessage &errmsg, const std::set<
     return isSuppressed(SuppressionList::ErrorMessage::fromErrorMessage(errmsg, macroNames));
 }
 
-void SuppressionList::dump(std::ostream & out) const
+void SuppressionList::dump(std::ostream & out, const std::string& filePath) const
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
     out << "  <suppressions>" << std::endl;
     for (const Suppression &suppression : mSuppressions) {
+        if (suppression.isInline && !suppression.fileName.empty() && !filePath.empty() && filePath != suppression.fileName)
+            continue;
         out << "    <suppression";
         out << " errorId=\"" << ErrorLogger::toxml(suppression.errorId) << '"';
         if (!suppression.fileName.empty())

lib/suppressions.h

@@ -252,7 +252,7 @@ class CPPCHECKLIB SuppressionList {
      * @brief Create an xml dump of suppressions
      * @param out stream to write XML to
      */
-    void dump(std::ostream &out) const;
+    void dump(std::ostream &out, const std::string& filePath = {}) const;
 
     /**
      * @brief Returns list of unmatched local (per-file) suppressions.

test/cli/inline-suppress_test.py

@@ -1,10 +1,11 @@
 
-# python -m pytest test-inline-suppress.py
+# python -m pytest inline-suppress_test.py
 
 import json
 import os
 import pytest
 import sys
+import time
 from testutils import cppcheck
 
 __script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -247,6 +248,35 @@ def test_build_dir(tmpdir):
     assert stdout == ''
     assert ret == 0, stdout
 
+def test_build_dir_jobs_suppressions(tmpdir): #14064
+    args = [
+        '-q',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(tmpdir),
+        '--enable=style',
+        '--inline-suppr',
+        '-j4',
+        'reanalysis'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+    a1Path = os.path.join(tmpdir, 'd.a1')
+    assert os.path.exists(a1Path)
+    mtimeOld = os.path.getmtime(a1Path)
+
+    time.sleep(1)
+
+    for _ in range(1, 10):
+        cppcheck(args, cwd=__script_dir)
+
+    mtimeNew = os.path.getmtime(a1Path)
+    assert mtimeOld == mtimeNew
+
 
 def __test_build_dir_unused_template(tmpdir, extra_args):
     args = [
@@ -470,4 +500,4 @@ def test_unmatched_cfg():
         '{}cfg.c:9:0: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
     ]
     assert stdout == ''
-    assert ret == 0, stdout
+    assert ret == 0, stdout

test/cli/reanalysis/a.cpp

@@ -0,0 +1,4 @@
+int main() {
+    int i; // cppcheck-suppress unusedVariable
+}
+

test/cli/reanalysis/b.cpp

@@ -0,0 +1,2 @@
+int main() {}
+

test/cli/reanalysis/c.cpp

@@ -0,0 +1,2 @@
+int main() {}
+

test/cli/reanalysis/d.cpp

@@ -0,0 +1,2 @@
+int main() {}
+