split off handling of inline suppressions

Author: firewave

lib/cppcheck.cpp

@@ -602,6 +602,10 @@ unsigned int CppCheck::check(const FileSettings &fs)
     const unsigned int returnValue = temp.checkFile(Path::simplifyPath(fs.filename), fs.cfg);
     for (const auto& suppr : temp.mSettings.supprs.nomsg.getSuppressions())
     {
+        // skip inline suppressions - are handled in checkFile()
+        if (suppr.isInline)
+            continue;
+
         const bool res = mSettings.supprs.nomsg.updateSuppressionState(suppr);
         if (!res)
             throw InternalError(nullptr, "could not update suppression '" + suppr.errorId + "'"); // TODO: remove
@@ -947,8 +951,10 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
                     fdump << "</dump>" << std::endl;
                 }
 
-                // Need to call this even if the hash will skip this configuration
-                mSettings.supprs.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer);
+                if (mSettings.inlineSuppressions) {
+                    // Need to call this even if the hash will skip this configuration
+                    mSettings.supprs.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer);
+                }
 
                 // Skip if we already met the same simplified token list
                 if (mSettings.force || mSettings.maxConfigs > 1) {
@@ -1038,10 +1044,16 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
         mAnalyzerInformation.close();
     }
 
-    // In jointSuppressionReport mode, unmatched suppressions are
-    // collected after all files are processed
-    if (!mSettings.useSingleJob() && (mSettings.severity.isEnabled(Severity::information) || mSettings.checkConfiguration)) {
-        SuppressionList::reportUnmatchedSuppressions(mSettings.supprs.nomsg.getUnmatchedLocalSuppressions(filename, (bool)mUnusedFunctionsCheck), *this);
+    if (mSettings.severity.isEnabled(Severity::information) || mSettings.checkConfiguration) {
+        // TODO: check result?
+        SuppressionList::reportUnmatchedSuppressions(mSettings.supprs.nomsg.getUnmatchedInlineSuppressions(false), *this);
+
+        // In jointSuppressionReport mode, unmatched suppressions are
+        // collected after all files are processed
+        if (!mSettings.useSingleJob()) {
+            // TODO: check result?
+            SuppressionList::reportUnmatchedSuppressions(mSettings.supprs.nomsg.getUnmatchedLocalSuppressions(filename, (bool)mUnusedFunctionsCheck), *this);
+        }
     }
 
     mErrorList.clear();

lib/preprocessor.cpp

@@ -229,6 +229,7 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
         // Add the suppressions.
         for (SuppressionList::Suppression &suppr : inlineSuppressions) {
             suppr.fileName = relativeFilename;
+            suppr.isInline = true; // TODO: set earlier
 
             if (SuppressionList::Type::blockBegin == suppr.type)
             {

lib/suppressions.cpp

@@ -492,6 +492,8 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedLocalSuppre
     std::string tmpFile = Path::simplifyPath(file);
     std::list<Suppression> result;
     for (const Suppression &s : mSuppressions) {
+        if (s.isInline)
+            continue;
         if (s.matched || ((s.lineNumber != Suppression::NO_LINE) && !s.checked))
             continue;
         if (s.type == SuppressionList::Type::macro)
@@ -513,6 +515,8 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppr
 {
     std::list<Suppression> result;
     for (const Suppression &s : mSuppressions) {
+        if (s.isInline)
+            continue;
         if (s.matched || ((s.lineNumber != Suppression::NO_LINE) && !s.checked))
             continue;
         if (s.hash > 0)
@@ -528,6 +532,25 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppr
     return result;
 }
 
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppressions(const bool unusedFunctionChecking) const
+{
+    std::list<SuppressionList::Suppression> result;
+    for (const SuppressionList::Suppression &s : SuppressionList::mSuppressions) {
+        if (!s.isInline)
+            continue;
+        if (!s.checked)
+            continue;
+        if (s.matched)
+            continue;
+        if (s.hash > 0)
+            continue;
+        if (!unusedFunctionChecking && s.errorId == ID_UNUSEDFUNCTION)
+            continue;
+        result.push_back(s);
+    }
+    return result;
+}
+
 const std::list<SuppressionList::Suppression> &SuppressionList::getSuppressions() const
 {
     return mSuppressions;

lib/suppressions.h

@@ -148,6 +148,7 @@ class CPPCHECKLIB SuppressionList {
         bool thisAndNextLine{}; // Special case for backwards compatibility: { // cppcheck-suppress something
         bool matched{};
         bool checked{}; // for inline suppressions, checked or not
+        bool isInline{};
 
         enum { NO_LINE = -1 };
     };
@@ -244,6 +245,12 @@ class CPPCHECKLIB SuppressionList {
      */
     std::list<Suppression> getUnmatchedGlobalSuppressions(const bool unusedFunctionChecking) const;
 
+    /**
+     * @brief Returns list of unmatched inline suppressions.
+     * @return list of unmatched suppressions
+     */
+    std::list<Suppression> getUnmatchedInlineSuppressions(const bool unusedFunctionChecking) const;
+
     /**
      * @brief Returns list of all suppressions.
      * @return list of suppressions

test/testsuppressions.cpp

@@ -880,7 +880,7 @@ class TestSuppressions : public TestFixture {
                        "#define DIV(A,B) A/B\n"
                        "a = DIV(10,1);\n",
                        "");
-        ASSERT_EQUALS("", errout_str()); // <- no unmatched suppression reported for macro suppression
+        ASSERT_EQUALS("[test.cpp:2]: (information) Unmatched suppression: abc\n", errout_str());
     }
 
     void suppressionsSettingsFiles() {