CheckUnusedFunctions: added dedicated check() / avoid ambiguity of analyseWholeProgram()

Author: firewave

lib/checkunusedfunctions.cpp

@@ -384,14 +384,11 @@ Check::FileInfo *CheckUnusedFunctions::getFileInfo(const Tokenizer *tokenizer, c
     return nullptr;
 }
 
-bool CheckUnusedFunctions::analyseWholeProgram(const CTU::FileInfo *ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger &errorLogger)
 {
-    (void)ctu;
-    (void)fileInfo;
     CheckUnusedFunctions dummy(nullptr, &settings, &errorLogger);
-    dummy.
-    logChecker("CheckUnusedFunctions::analyseWholeProgram"); // unusedFunctions
-    return check(&errorLogger, settings);
+    dummy.logChecker("CheckUnusedFunctions::analyseWholeProgram");
+    return instance.check(&errorLogger, settings);
 }
 
 CheckUnusedFunctions::FunctionDecl::FunctionDecl(const Function *f)
@@ -421,7 +418,7 @@ namespace {
     };
 }
 
-void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir)
+void CheckUnusedFunctions::analyseWholeProgram2(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir)
 {
     std::map<std::string, Location> decls;
     std::set<std::string> calls;

lib/checkunusedfunctions.h

@@ -68,18 +68,17 @@ class CPPCHECKLIB CheckUnusedFunctions : public Check {
     /** @brief Parse current TU and extract file info */
     Check::FileInfo *getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const override;
 
-    /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo *ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
-
     std::string analyzerInfo() const;
 
     /** @brief Combine and analyze all analyzerInfos for all TUs */
-    static void analyseWholeProgram(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir);
+    static void analyseWholeProgram2(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir);
 
     static void getErrorMessages(ErrorLogger *errorLogger) {
         unusedFunctionError(errorLogger, emptyString, 0, 0, "funcName");
     }
 
+    static bool check(const Settings& settings, ErrorLogger &errorLogger);
+
 private:
     static void clear();
 

lib/cppcheck.cpp

@@ -1772,9 +1772,13 @@ bool CppCheck::analyseWholeProgram()
             ctu.nestedCalls.insert(ctu.nestedCalls.end(), fi2->nestedCalls.cbegin(), fi2->nestedCalls.cend());
         }
     }
+
     // cppcheck-suppress shadowFunction - TODO: fix this
     for (Check *check : Check::instances())
         errors |= check->analyseWholeProgram(&ctu, mFileInfo, mSettings, *this);  // TODO: ctu
+
+    errors |= CheckUnusedFunctions::check(mSettings, *this);
+
     return errors && (mExitCode > 0);
 }
 
@@ -1786,7 +1790,7 @@ void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<
         return;
     }
     if (mSettings.checks.isEnabled(Checks::unusedFunction))
-        CheckUnusedFunctions::analyseWholeProgram(mSettings, this, buildDir);
+        CheckUnusedFunctions::analyseWholeProgram2(mSettings, this, buildDir);
     std::list<Check::FileInfo*> fileInfoList;
     CTU::FileInfo ctuFileInfo;
 
@@ -1839,6 +1843,8 @@ void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<
     for (Check *check : Check::instances())
         check->analyseWholeProgram(&ctuFileInfo, fileInfoList, mSettings, *this);
 
+    CheckUnusedFunctions::check(mSettings, *this);
+
     for (Check::FileInfo *fi : fileInfoList)
         delete fi;
 }