do not report unmatched inline suppressions until the whole program analysis has been run

Author: firewave

cli/cppcheckexecutor.cpp

@@ -413,7 +413,7 @@ bool CppCheckExecutor::reportSuppressions(const Settings &settings, const Suppre
     if (settings.inlineSuppressions) {
         // report unmatched unusedFunction suppressions
         err |= SuppressionList::reportUnmatchedSuppressions(
-            suppressions.getUnmatchedInlineSuppressions(SuppressionList::UnusedFunction::Only), errorLogger);
+            suppressions.getUnmatchedInlineSuppressions(), errorLogger);
     }
 
     err |= SuppressionList::reportUnmatchedSuppressions(suppressions.getUnmatchedGlobalSuppressions(unusedFunctionCheckEnabled), errorLogger);

lib/cppcheck.cpp

@@ -1275,13 +1275,6 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
 
     // TODO: this is done too early causing the whole program analysis suppressions to be reported as unmatched
     if (mSettings.severity.isEnabled(Severity::information) || mSettings.checkConfiguration) {
-        if (mSettings.inlineSuppressions)
-        {
-            // TODO: check result?
-            // defer reporting of unusedFunction to later
-            SuppressionList::reportUnmatchedSuppressions(mSettings.supprs.nomsg.getUnmatchedInlineSuppressions(SuppressionList::UnusedFunction::Exclude), mErrorLogger);
-        }
-
         // In jointSuppressionReport mode, unmatched suppressions are
         // collected after all files are processed
         if (!mSettings.useSingleJob()) {

lib/suppressions.cpp

@@ -542,7 +542,7 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppr
     return result;
 }
 
-std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppressions(const UnusedFunction unusedFunction) const
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppressions() const
 {
     std::list<SuppressionList::Suppression> result;
     for (const SuppressionList::Suppression &s : SuppressionList::mSuppressions) {
@@ -554,10 +554,6 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppr
             continue;
         if (s.hash > 0)
             continue;
-        if (unusedFunction == UnusedFunction::Only && s.errorId != ID_UNUSEDFUNCTION)
-            continue;
-        if (unusedFunction == UnusedFunction::Exclude && s.errorId == ID_UNUSEDFUNCTION)
-            continue;
         result.push_back(s);
     }
     return result;

lib/suppressions.h

@@ -249,16 +249,11 @@ class CPPCHECKLIB SuppressionList {
      */
     std::list<Suppression> getUnmatchedGlobalSuppressions(bool includeUnusedFunction) const;
 
-    enum UnusedFunction : std::uint8_t {
-        Exclude,
-        Only
-    };
-
     /**
      * @brief Returns list of unmatched inline suppressions.
      * @return list of unmatched suppressions
      */
-    std::list<Suppression> getUnmatchedInlineSuppressions(const UnusedFunction unusedFunction) const;
+    std::list<Suppression> getUnmatchedInlineSuppressions() const;
 
     /**
      * @brief Returns list of all suppressions.