Fix #10039 (integrate --check-config include findings with normal analysis)

Author: firewave

cli/cmdlineparser.cpp

@@ -1077,8 +1077,7 @@ void CmdLineParser::printHelp()
         "                                  to only enable this when the whole program is\n"
         "                                  scanned.\n"
         "                          * missingInclude\n"
-        "                                  Warn if there are missing includes. For\n"
-        "                                  detailed information, use '--check-config'.\n"
+        "                                  Warn if there are missing includes.\n"
         "                         Several ids can be given if you separate them with\n"
         "                         commas. See also --std\n"
         "    --error-exitcode=<n> If errors are found, integer [n] is returned instead of\n"

cli/cppcheckexecutor.cpp

@@ -200,9 +200,6 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
 
 int CppCheckExecutor::check(int argc, const char* const argv[])
 {
-    Preprocessor::missingIncludeFlag = false;
-    Preprocessor::missingSystemIncludeFlag = false;
-
     CheckUnusedFunctions::clear();
 
     CppCheck cppCheck(*this, true, executeCommand);
@@ -388,29 +385,6 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck)
 
     if (!settings.checkConfiguration) {
         cppcheck.tooManyConfigsError(emptyString,0U);
-
-        if (settings.checks.isEnabled(Checks::missingInclude) && (Preprocessor::missingIncludeFlag || Preprocessor::missingSystemIncludeFlag)) {
-            const std::list<ErrorMessage::FileLocation> callStack;
-            ErrorMessage msg(callStack,
-                             emptyString,
-                             Severity::information,
-                             "Cppcheck cannot find all the include files (use --check-config for details)\n"
-                             "Cppcheck cannot find all the include files. Cppcheck can check the code without the "
-                             "include files found. But the results will probably be more accurate if all the include "
-                             "files are found. Please check your project's include directories and add all of them "
-                             "as include directories for Cppcheck. To see what files Cppcheck cannot find use "
-                             "--check-config.",
-                             "",
-                             Certainty::normal);
-            if (Preprocessor::missingIncludeFlag) {
-                msg.id = "missingInclude";
-                reportInfo(msg);
-            }
-            if (Preprocessor::missingSystemIncludeFlag) {
-                msg.id = "missingIncludeSystem";
-                reportInfo(msg);
-            }
-        }
     }
 
     if (settings.xml) {

lib/preprocessor.cpp

@@ -62,9 +62,6 @@ Directive::Directive(std::string _file, const int _linenr, const std::string &_s
     str(trim(_str))
 {}
 
-std::atomic<bool> Preprocessor::missingIncludeFlag;
-std::atomic<bool> Preprocessor::missingSystemIncludeFlag;
-
 char Preprocessor::macroChar = char(1);
 
 Preprocessor::Preprocessor(Settings& settings, ErrorLogger *errorLogger) : mSettings(settings), mErrorLogger(errorLogger)
@@ -840,26 +837,19 @@ void Preprocessor::error(const std::string &filename, unsigned int linenr, const
 // Report that include is missing
 void Preprocessor::missingInclude(const std::string &filename, unsigned int linenr, const std::string &header, HeaderTypes headerType)
 {
-    if (!mSettings.checks.isEnabled(Checks::missingInclude) && !mSettings.checkConfiguration)
+    if (!mSettings.checks.isEnabled(Checks::missingInclude))
         return;
 
     const std::string fname = Path::fromNativeSeparators(filename);
+    const std::string errorId = (headerType==SystemHeader) ? "missingIncludeSystem" : "missingInclude";
     Suppressions::ErrorMessage errorMessage;
-    errorMessage.errorId = "missingInclude";
+    errorMessage.errorId = errorId;
     errorMessage.setFileName(fname);
     errorMessage.lineNumber = linenr;
     if (mSettings.nomsg.isSuppressed(errorMessage))
         return;
-    errorMessage.errorId = "missingIncludeSystem";
-    if (headerType == SystemHeader && mSettings.nomsg.isSuppressed(errorMessage))
-        return;
-
-    if (headerType == SystemHeader)
-        missingSystemIncludeFlag = true;
-    else
-        missingIncludeFlag = true;
 
-    if (mErrorLogger && mSettings.checkConfiguration) {
+    if (mErrorLogger) {
 
         std::list<ErrorMessage::FileLocation> locationList;
         if (!filename.empty()) {
@@ -872,7 +862,7 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line
                             (headerType==SystemHeader) ?
                             "Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results." :
                             "Include file: \"" + header + "\" not found.",
-                            (headerType==SystemHeader) ? "missingIncludeSystem" : "missingInclude",
+                            errorId,
                             Certainty::normal);
         mErrorLogger->reportInfo(errmsg);
     }
@@ -920,7 +910,6 @@ void Preprocessor::getErrorMessages(ErrorLogger *errorLogger, const Settings *se
 {
     Settings settings2(*settings);
     Preprocessor preprocessor(settings2, errorLogger);
-    settings2.checkConfiguration = true;
     preprocessor.missingInclude(emptyString, 1, emptyString, UserHeader);
     preprocessor.missingInclude(emptyString, 1, emptyString, SystemHeader);
     preprocessor.validateCfgError(emptyString, 1, "X", "X");

lib/preprocessor.h

@@ -87,9 +87,6 @@ class CPPCHECKLIB Preprocessor {
     explicit Preprocessor(Settings& settings, ErrorLogger *errorLogger = nullptr);
     virtual ~Preprocessor();
 
-    static std::atomic<bool> missingIncludeFlag;
-    static std::atomic<bool> missingSystemIncludeFlag;
-
     void inlineSuppressions(const simplecpp::TokenList &tokens);
 
     void setDirectives(const simplecpp::TokenList &tokens);

man/cppcheck.1.xml

@@ -283,7 +283,7 @@ Example: '-UDEBUG'</para>
                   enables unusedFunction.</para></glossdef></glossentry><glossentry><glossterm>warning</glossterm><glossdef><para>Enable warning messages</para></glossdef></glossentry><glossentry><glossterm>style</glossterm><glossdef><para>Enable all coding style checks. All messages with the
                   severities 'style', 'performance' and 'portability' are
                   enabled.</para></glossdef></glossentry><glossentry><glossterm>performance</glossterm><glossdef><para>Enable performance messages</para></glossdef></glossentry><glossentry><glossterm>portability</glossterm><glossdef><para>Enable portability messages</para></glossdef></glossentry><glossentry><glossterm>information</glossterm><glossdef><para>Enable information messages</para></glossdef></glossentry><glossentry><glossterm>unusedFunction</glossterm><glossdef><para>Check for unused functions. It is recommend to only
-                  enable this when the whole program is scanned</para></glossdef></glossentry><glossentry><glossterm>missingInclude</glossterm><glossdef><para>Warn if there are missing includes. For detailed information use --check-config</para></glossdef></glossentry></glosslist>
+                  enable this when the whole program is scanned</para></glossdef></glossentry><glossentry><glossterm>missingInclude</glossterm><glossdef><para>Warn if there are missing includes</para></glossdef></glossentry></glosslist>
             By default none of the additional checks are enabled. Several ids can be given if you separate them with commas, e.g. --enable=style,unusedFunction. See also --std
           </para>
         </listitem>

test/testpreprocessor.cpp

@@ -259,7 +259,6 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(testDirectiveIncludeComments);
 
         TEST_CASE(testMissingInclude);
-        TEST_CASE(testMissingIncludeCheckConfig);
     }
 
     void preprocess(const char* code, std::map<std::string, std::string>& actual, const char filename[] = "file.c") {
@@ -1937,16 +1936,11 @@ class TestPreprocessor : public TestFixture {
         preprocess("#define () {(int f(x) }\n", actual); // don't hang
     }
 
-    void inline_suppression_for_missing_include_internal(bool checkConfig) {
-        Preprocessor::missingIncludeFlag = false;
-        Preprocessor::missingSystemIncludeFlag = false;
+    void inline_suppression_for_missing_include_internal() {
         Settings settings;
-        settings.checkConfiguration = checkConfig;
         settings.inlineSuppressions = true;
         settings.severity.clear();
-        // --check-config needs to report this regardless of the emanled checks
-        if (!checkConfig)
-            settings.checks.enable(Checks::missingInclude);
+        settings.checks.enable(Checks::missingInclude);
         Preprocessor preprocessor(settings, this);
 
         const std::string code("// cppcheck-suppress missingInclude\n"
@@ -1957,8 +1951,6 @@ class TestPreprocessor : public TestFixture {
         errout.str("");
         preprocessor.getcode(code, "", "test.c");
         ASSERT_EQUALS("", errout.str());
-        ASSERT_EQUALS(false, Preprocessor::missingIncludeFlag);
-        ASSERT_EQUALS(false, Preprocessor::missingSystemIncludeFlag);
 
         auto suppressions = settings.nomsg.getSuppressions();
         ASSERT_EQUALS(2, suppressions.size());
@@ -1984,10 +1976,6 @@ class TestPreprocessor : public TestFixture {
         inline_suppression_for_missing_include_internal(false);
     }
 
-    void inline_suppression_for_missing_include_check_config() {
-        inline_suppression_for_missing_include_internal(true);
-    }
-
     void predefine1() {
         const std::string src("#if defined X || Y\n"
                               "Fred & Wilma\n"
@@ -2433,9 +2421,6 @@ class TestPreprocessor : public TestFixture {
     }
 
     void testMissingInclude() {
-        Preprocessor::missingIncludeFlag = false;
-        Preprocessor::missingSystemIncludeFlag = false;
-
         Settings settings;
         settings.severity.clear();
         settings.checks.enable(Checks::missingInclude);
@@ -2450,43 +2435,9 @@ class TestPreprocessor : public TestFixture {
                          "#include \"header2.h\"");
         errout.str("");
         preprocessor.getcode(code, "", "test.c");
-        ASSERT_EQUALS(true, Preprocessor::missingIncludeFlag);
-        ASSERT_EQUALS(true, Preprocessor::missingSystemIncludeFlag);
 
         // the expected messages are emited outside of the Preprocessor
         ASSERT_EQUALS("", errout.str());
-
-        Preprocessor::missingIncludeFlag = false;
-        Preprocessor::missingSystemIncludeFlag = false;
-    }
-
-    void testMissingIncludeCheckConfig() {
-        Preprocessor::missingIncludeFlag = false;
-        Preprocessor::missingSystemIncludeFlag = false;
-
-        Settings settings;
-        settings.checkConfiguration = true;
-        settings.severity.clear();
-        // needs to be reported regardless of enabled checks
-        Preprocessor preprocessor(settings, this);
-
-        ScopedFile header("header.h", "");
-        ScopedFile header2("header2.h", "");
-
-        std::string code("#include \"missing.h\"\n"
-                         "#include <header.h>\n"
-                         "#include <missing2.h>\n"
-                         "#include \"header2.h\"");
-        errout.str("");
-        preprocessor.getcode(code, "", "test.c");
-        ASSERT_EQUALS(true, Preprocessor::missingIncludeFlag);
-        ASSERT_EQUALS(true, Preprocessor::missingSystemIncludeFlag);
-
-        ASSERT_EQUALS("[test.c:1]: (information) Include file: \"missing.h\" not found.\n"
-                      "[test.c:3]: (information) Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.\n", errout.str());
-
-        Preprocessor::missingIncludeFlag = false;
-        Preprocessor::missingSystemIncludeFlag = false;
     }
 };