added CLI option to disable "ifdef" bailout

Author: firewave

cli/cmdlineparser.cpp

@@ -1031,6 +1031,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.cppHeaderProbe = false;
         }
 
+        else if (std::strcmp(argv[i], "--no-ifdef-bailout") == 0) {
+            mSettings.ifdefBailout = false;
+        }
+
         // Write results in file
         else if (std::strncmp(argv[i], "--output-file=", 14) == 0)
             mSettings.outputFile = Path::simplifyPath(argv[i] + 14);

lib/checkclass.cpp

@@ -2371,7 +2371,7 @@ const std::set<std::string> CheckClass::stl_containers_not_const = { "map", "uno
 bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, MemberAccess& memberAccessed) const
 {
     if (mTokenizer->hasIfdef(func->functionScope->bodyStart, func->functionScope->bodyEnd))
-        return false;
+        return false; // TODO: log bailout?
 
     auto getFuncTok = [](const Token* tok) -> const Token* {
         if (Token::simpleMatch(tok, "this"))

lib/checkcondition.cpp

@@ -331,7 +331,7 @@ void CheckCondition::checkBadBitmaskCheck()
             // If there are #ifdef in the expression don't warn about redundant | to avoid FP
             const auto& startStop = tok->findExpressionStartEndTokens();
             if (mTokenizer->hasIfdef(startStop.first, startStop.second))
-                continue;
+                continue; // TODO: log bailout?
 
             const bool isZero1 = (tok->astOperand1()->hasKnownIntValue() && tok->astOperand1()->getKnownIntValue() == 0);
             const bool isZero2 = (tok->astOperand2()->hasKnownIntValue() && tok->astOperand2()->getKnownIntValue() == 0);
@@ -765,6 +765,7 @@ void CheckCondition::multiCondition2()
                                     identicalConditionAfterEarlyExitError(cond1, secondCondition, errorPath);
                                     return ChildrenToVisit::done;
                                 }
+                                // TODO: log bailout?
                             }
                             return ChildrenToVisit::none;
                         });

lib/checkother.cpp

@@ -1100,7 +1100,7 @@ void CheckOther::checkVariableScope()
             continue;
 
         if (mTokenizer->hasIfdef(var->nameToken(), var->scope()->bodyEnd))
-            continue;
+            continue; // TODO: log bailout?
 
         // reference of range for loop variable..
         if (Token::Match(var->nameToken()->previous(), "& %var% = %var% .")) {

lib/settings.h

@@ -259,6 +259,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Force checking the files with "too many" configurations (--force). */
     bool force{};
 
+    /** @brief Perform bailouts when #if blocks are encountered in checks. */
+    bool ifdefBailout{true};
+
     /** @brief List of include paths, e.g. "my/includes/" which should be used
         for finding include files inside source files. (-I) */
     std::list<std::string> includePaths;

lib/tokenize.cpp

@@ -10948,6 +10948,9 @@ void Tokenizer::setDirectives(std::list<Directive> directives)
 
 bool Tokenizer::hasIfdef(const Token *start, const Token *end) const
 {
+    if (!mSettings.ifdefBailout)
+        return false;
+
     const auto& directives = mDirectives;
     return std::any_of(directives.cbegin(), directives.cend(), [&](const Directive& d) {
         return startsWith(d.str, "#if") &&