apply DISABLE_VALUEFLOW via ValueFlowOptions::enabled

danmar · May 1, 2024 · d65f697 · d65f697
1 parent 45dee67
commit d65f697
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -287,6 +287,10 @@ void Settings::loadSummaries()
 
 void Settings::setCheckLevel(CheckLevel level)
 {
+    // TODO: requires regular settings creation to be applied
+    const char * const disableValueflowEnv = std::getenv("DISABLE_VALUEFLOW");
+    vfOptions.enabled = !disableValueflowEnv || (std::strcmp(disableValueflowEnv, "1") != 0);
+
     if (level == CheckLevel::normal) {
         // Checking should finish in reasonable time.
         checkLevel = level;

diff --git a/lib/settings.h b/lib/settings.h
@@ -384,6 +384,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
 
     struct ValueFlowOptions
     {
+        /** @brief Control if ValueFlow is performed in Tokenizer::simplifyTokens1() */
+        bool enabled = true;
+
         /** @brief the maximum iterations to execute */
         std::size_t maxIterations = 4;
 

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -3421,10 +3421,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
         Summaries::create(*this, configuration);
 
     // TODO: do not run valueflow if no checks are being performed at all - e.g. unusedFunctions only
-    const char* disableValueflowEnv = std::getenv("DISABLE_VALUEFLOW");
-    const bool doValueFlow = !disableValueflowEnv || (std::strcmp(disableValueflowEnv, "1") != 0);
-
-    if (doValueFlow) {
+    if (mSettings.vfOptions.enabled) {
         if (mTimerResults) {
             Timer t("Tokenizer::simplifyTokens1::ValueFlow", mSettings.showtime, mTimerResults);
             ValueFlow::setValues(list, *mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
@@ -3448,7 +3445,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
         }
     }
 
-    if (doValueFlow) {
+    if (mSettings.vfOptions.enabled) {
         mSymbolDatabase->setArrayDimensionsUsingValueFlow();
     }