generate ctu-info from FileSettings for whole project analysis

danmar · Jun 9, 2024 · 8983636 · 8983636
1 parent 7cb8f2b
commit 8983636
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -1461,7 +1461,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
     }
 }
 
-void CppCheck::executeAddonsWholeProgram(const std::list<std::pair<std::string, std::size_t>> &files)
+void CppCheck::executeAddonsWholeProgram(const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings)
 {
     if (mSettings.addons.empty())
         return;
@@ -1472,6 +1472,15 @@ void CppCheck::executeAddonsWholeProgram(const std::list<std::pair<std::string,
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
+    for (const auto &f: fileSettings) { // --project
+        const std::string &dumpFileName = getDumpFileName(mSettings, f.filename);
+
+        // ignore duplciates
+        auto it = std::find(ctuInfoFiles.begin(), ctuInfoFiles.end(), getCtuInfoFileName(dumpFileName));
+        if (it == ctuInfoFiles.end())
+            ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
+    }
+
     try {
         executeAddons(ctuInfoFiles, "");
     } catch (const InternalError& e) {
@@ -1758,7 +1767,7 @@ bool CppCheck::analyseWholeProgram()
 
 unsigned int CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings)
 {
-    executeAddonsWholeProgram(files); // TODO: pass FileSettings
+    executeAddonsWholeProgram(files, fileSettings);
     if (buildDir.empty()) {
         removeCtuInfoFiles(files, fileSettings);
         return mExitCode;

diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -192,7 +192,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     /**
      * Execute addons
      */
-    void executeAddonsWholeProgram(const std::list<std::pair<std::string, std::size_t>> &files);
+    void executeAddonsWholeProgram(const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings);
 
 #ifdef HAVE_RULES
     /**