Remove some flags

Author: Your Name

lib/symboldatabase.cpp

@@ -58,7 +58,7 @@
 
 static const Type* findVariableTypeInBase(const Scope* scope, const Token* typeTok);
 
-SymbolDatabase::SymbolDatabase(Tokenizer& tokenizer, bool deferFinalizePhases)
+SymbolDatabase::SymbolDatabase(Tokenizer& tokenizer)
     : mTokenizer(tokenizer)
     , mSettings(tokenizer.getSettings())
     , mErrorLogger(tokenizer.getErrorLogger())
@@ -88,17 +88,10 @@ SymbolDatabase::SymbolDatabase(Tokenizer& tokenizer, bool deferFinalizePhases)
     createSymbolDatabaseSetSmartPointerType();
     setValueTypeInTokenList(false);
     createSymbolDatabaseEnums();
-
-    if (!deferFinalizePhases)
-        finalize();
 }
 
 void SymbolDatabase::finalize()
 {
-    if (mFinalized)
-        return;
-    mFinalized = true;
-
     if (!mTokenizer.tokens())
         return;
 

lib/symboldatabase.h

@@ -1340,11 +1340,11 @@ class CPPCHECKLIB SymbolDatabase {
     friend class TestSymbolDatabase;
 public:
     /**
-     * @param deferFinalizePhases don't run the phases that only later analysis
-     * (ValueFlow, checks) needs - finalize() must be called when the token list is
-     * final. Used while the template simplifier still changes the token list.
+     * The phases that only later analysis (ValueFlow, checks) needs are not run by the
+     * constructor - call finalize() when the token list is final, e.g. after the
+     * template simplifier can no longer change it.
      */
-    explicit SymbolDatabase(Tokenizer& tokenizer, bool deferFinalizePhases = false);
+    explicit SymbolDatabase(Tokenizer& tokenizer);
     ~SymbolDatabase();
 
     /** @brief Information about all namespaces/classes/structures */
@@ -1457,8 +1457,8 @@ class CPPCHECKLIB SymbolDatabase {
     void addSymbolsForNewTokenRanges(const std::vector<std::pair<Token*, Token*>>& newRanges);
 
     /**
-     * Run the phases that only later analysis (ValueFlow, checks) needs. Called once
-     * when the token list is final - does nothing when already finalized.
+     * Run the phases that only later analysis (ValueFlow, checks) needs. Call exactly
+     * once, when the token list is final.
      */
     void finalize();
 
@@ -1564,9 +1564,6 @@ class CPPCHECKLIB SymbolDatabase {
 
     ValueType::Sign mDefaultSignedness;
 
-    /** true when the finalize() phases have run */
-    bool mFinalized{};
-
     mutable std::map<const Type*, bool> mIsRecordTypeWithoutSideEffectsMap;
 };
 

lib/tokenize.cpp

@@ -3537,28 +3537,27 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
         list.validateAst(mSettings.debugnormal);
     });
 
-    // while pending type deductions may still change the token list, the symbol
-    // database phases that only later analysis needs are deferred to finalize()
-    const bool typeDeductionsPending = isCPP() && mTemplateSimplifier->hasPendingTypeDeductions();
-
     Timer::run("Tokenizer::simplifyTokens1::createSymbolDatabase", mTimerResults, [&]() {
-        createSymbolDatabase(typeDeductionsPending);
+        createSymbolDatabase();
     });
 
     Timer::run("Tokenizer::simplifyTokens1::setValueType", mTimerResults, [&]() {
         mSymbolDatabase->setValueTypeInTokenList(false);
         mSymbolDatabase->setValueTypeInTokenList(true);
     });
 
-    if (typeDeductionsPending) {
+    if (isCPP() && mTemplateSimplifier->hasPendingTypeDeductions()) {
         Timer::run("Tokenizer::simplifyTokens1::simplifyTemplatesUsingTypeInformation", mTimerResults, [&]() {
             simplifyTemplatesUsingTypeInformation();
         });
-        Timer::run("Tokenizer::simplifyTokens1::finalizeSymbolDatabase", mTimerResults, [&]() {
-            mSymbolDatabase->finalize();
-        });
     }
 
+    // the phases that only later analysis needs run when the template simplifier can
+    // no longer change the token list
+    Timer::run("Tokenizer::simplifyTokens1::finalizeSymbolDatabase", mTimerResults, [&]() {
+        mSymbolDatabase->finalize();
+    });
+
     if (!mSettings.buildDir.empty())
         Summaries::create(*this, configuration, fileIndex);
 
@@ -4340,7 +4339,7 @@ void Tokenizer::rebuildTokenDataAfterTemplateSimplification()
     mSymbolDatabase = nullptr;
     // the phases that only later analysis needs are run by finalize() after the
     // template simplification is done
-    createSymbolDatabase(/*deferFinalizePhases*/ true);
+    createSymbolDatabase();
     mSymbolDatabase->setValueTypeInTokenList(false);
     mSymbolDatabase->setValueTypeInTokenList(true);
 }
@@ -10824,10 +10823,10 @@ void Tokenizer::simplifyBorland()
     }
 }
 
-void Tokenizer::createSymbolDatabase(bool deferFinalizePhases)
+void Tokenizer::createSymbolDatabase()
 {
     if (!mSymbolDatabase)
-        mSymbolDatabase = new SymbolDatabase(*this, deferFinalizePhases);
+        mSymbolDatabase = new SymbolDatabase(*this);
     mSymbolDatabase->validate();
 }
 

lib/tokenize.h

@@ -606,13 +606,7 @@ class CPPCHECKLIB Tokenizer {
     const SymbolDatabase *getSymbolDatabase() const {
         return mSymbolDatabase;
     }
-    /**
-     * Create the symbol database.
-     * @param deferFinalizePhases skip the phases that only later analysis needs;
-     * SymbolDatabase::finalize() must be called when the token list is final. Used
-     * while the template simplifier still changes the token list.
-     */
-    void createSymbolDatabase(bool deferFinalizePhases = false);
+    void createSymbolDatabase();
 
     /** print --debug output if debug flags match the simplification:
      */