do not perform whole program analysis with UNUSEDFUNCTION_ONLY hack

Author: firewave

cli/singleexecutor.cpp

@@ -67,6 +67,7 @@ unsigned int SingleExecutor::check()
             reportStatus(c, mFileSettings.size(), c, mFileSettings.size());
     }
 
+    // TODO: CppCheckExecutor::check_internal() is also invoking the whole program analysis - is it run twice?
     if (mCppcheck.analyseWholeProgram())
         result++;
 

lib/cppcheck.cpp

@@ -1798,22 +1798,25 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
 bool CppCheck::analyseWholeProgram()
 {
     bool errors = false;
-    // Analyse the tokens
-    CTU::FileInfo ctu;
-    if (mSettings.useSingleJob() || !mSettings.buildDir.empty())
-    {
-        for (const Check::FileInfo *fi : mFileInfo) {
-            const auto *fi2 = dynamic_cast<const CTU::FileInfo *>(fi);
-            if (fi2) {
-                ctu.functionCalls.insert(ctu.functionCalls.end(), fi2->functionCalls.cbegin(), fi2->functionCalls.cend());
-                ctu.nestedCalls.insert(ctu.nestedCalls.end(), fi2->nestedCalls.cbegin(), fi2->nestedCalls.cend());
+
+    if (!Settings::unusedFunctionOnly()) {
+        // Analyse the tokens
+        CTU::FileInfo ctu;
+        if (mSettings.useSingleJob() || !mSettings.buildDir.empty())
+        {
+            for (const Check::FileInfo *fi : mFileInfo) {
+                const auto *fi2 = dynamic_cast<const CTU::FileInfo *>(fi);
+                if (fi2) {
+                    ctu.functionCalls.insert(ctu.functionCalls.end(), fi2->functionCalls.cbegin(), fi2->functionCalls.cend());
+                    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, mErrorLogger);  // TODO: ctu
+        // cppcheck-suppress shadowFunction - TODO: fix this
+        for (Check *check : Check::instances())
+            errors |= check->analyseWholeProgram(ctu, mFileInfo, mSettings, mErrorLogger);  // TODO: ctu
+    }
 
     if (mUnusedFunctionsCheck)
         errors |= mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
@@ -1823,9 +1826,16 @@ bool CppCheck::analyseWholeProgram()
 
 unsigned int CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo)
 {
-    executeAddonsWholeProgram(files, fileSettings, ctuInfo);
     if (mSettings.checks.isEnabled(Checks::unusedFunction))
         CheckUnusedFunctions::analyseWholeProgram(mSettings, mErrorLogger, buildDir);
+
+    if (mUnusedFunctionsCheck)
+        mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
+
+    if (Settings::unusedFunctionOnly())
+        return mLogger->exitcode();
+
+    executeAddonsWholeProgram(files, fileSettings, ctuInfo);
     std::list<Check::FileInfo*> fileInfoList;
     CTU::FileInfo ctuFileInfo;
 
@@ -1876,9 +1886,6 @@ unsigned int CppCheck::analyseWholeProgram(const std::string &buildDir, const st
     for (Check *check : Check::instances())
         check->analyseWholeProgram(ctuFileInfo, fileInfoList, mSettings, mErrorLogger);
 
-    if (mUnusedFunctionsCheck)
-        mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
-
     for (Check::FileInfo *fi : fileInfoList)
         delete fi;
 

test/cli/other_test.py

@@ -4034,35 +4034,26 @@ def __test_active_checkers(tmp_path, active_cnt, total_cnt, use_misra=False, use
 
 
 def test_active_unusedfunction_only(tmp_path):
-    # TODO: should only report a single active check
-    __test_active_checkers(tmp_path, 5, 966, use_unusedfunction_only=True)
+    __test_active_checkers(tmp_path, 1, 966, use_unusedfunction_only=True)
 
 
 def test_active_unusedfunction_only_builddir(tmp_path):
     # TODO: should only report a single active check
     checkers_exp = [
-        'CheckBufferOverrun::analyseWholeProgram',
-        'CheckClass::analyseWholeProgram',
-        'CheckNullPointer::analyseWholeProgram',
-        'CheckUninitVar::analyseWholeProgram',
-        'CheckUnusedFunctions::check',
+        'CheckUnusedFunctions::check'
     ]
-    __test_active_checkers(tmp_path, 5, 966, use_unusedfunction_only=True, checkers_exp=checkers_exp)
+    __test_active_checkers(tmp_path, 1, 966, use_unusedfunction_only=True, checkers_exp=checkers_exp)
 
 
 def test_active_unusedfunction_only_misra(tmp_path):
     # TODO: should only report a single active check
-    __test_active_checkers(tmp_path, 267, 1166, use_unusedfunction_only=True, use_misra=True)
+    __test_active_checkers(tmp_path, 263, 1166, use_unusedfunction_only=True, use_misra=True)
 
 
 @pytest.mark.xfail(strict=True)  # TODO: active count and checkers.txt differ
 def test_active_unusedfunction_only_misra_builddir(tmp_path):
     # TODO: should only report a single active check
     checkers_exp = [
-        'CheckBufferOverrun::analyseWholeProgram',
-        'CheckClass::analyseWholeProgram',
-        'CheckNullPointer::analyseWholeProgram',
-        'CheckUninitVar::analyseWholeProgram',
         'CheckUnusedFunctions::check',
         'Misra C: 1.2',
         'Misra C: 1.4',
@@ -4195,4 +4186,4 @@ def test_active_unusedfunction_only_misra_builddir(tmp_path):
         'Misra C: 9.4',
         'Misra C: 9.5'
     ]
-    __test_active_checkers(tmp_path, 267, 1166, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)
+    __test_active_checkers(tmp_path, 263, 1166, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)