ValueFlow: pass ErrorLogger by reference into ValueFlow::setValues()

Author: firewave

lib/cppcheck.cpp

@@ -514,7 +514,7 @@ unsigned int CppCheck::checkClang(const std::string &path)
         clangimport::parseClangAstDump(tokenizer, ast);
         ValueFlow::setValues(tokenizer.list,
                              const_cast<SymbolDatabase&>(*tokenizer.getSymbolDatabase()),
-                             this,
+                             *this,
                              mSettings,
                              &s_timerResults);
         if (mSettings.debugnormal)

lib/forwardanalyzer.cpp

@@ -47,12 +47,12 @@ namespace {
     struct ForwardTraversal {
         enum class Progress { Continue, Break, Skip };
         enum class Terminate { None, Bail, Inconclusive };
-        ForwardTraversal(const ValuePtr<Analyzer>& analyzer, const TokenList& tokenList, ErrorLogger* const errorLogger, const Settings& settings)
+        ForwardTraversal(const ValuePtr<Analyzer>& analyzer, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings)
             : analyzer(analyzer), tokenList(tokenList), errorLogger(errorLogger), settings(settings)
         {}
         ValuePtr<Analyzer> analyzer;
         const TokenList& tokenList;
-        ErrorLogger* const errorLogger;
+        ErrorLogger& errorLogger;
         const Settings& settings;
         Analyzer::Action actions;
         bool analyzeOnly{};
@@ -838,12 +838,10 @@ namespace {
         }
 
         void reportError(Severity severity, const std::string& id, const std::string& msg) {
-            if (errorLogger) {
-                const ErrorMessage::FileLocation loc(tokenList.getSourceFilePath(), 1, 1);
-                const std::list<ErrorMessage::FileLocation> callstack{loc};
-                const ErrorMessage errmsg(callstack, tokenList.getSourceFilePath(), severity, msg, id, Certainty::normal);
-                errorLogger->reportErr(errmsg);
-            }
+            const ErrorMessage::FileLocation loc(tokenList.getSourceFilePath(), 1, 1);
+            const std::list<ErrorMessage::FileLocation> callstack{loc};
+            const ErrorMessage errmsg(callstack, tokenList.getSourceFilePath(), severity, msg, id, Certainty::normal);
+            errorLogger.reportErr(errmsg);
         }
 
         static bool isFunctionCall(const Token* tok)
@@ -904,7 +902,7 @@ namespace {
     };
 }
 
-Analyzer::Result valueFlowGenericForward(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger* const errorLogger, const Settings& settings)
+Analyzer::Result valueFlowGenericForward(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (a->invalid())
         return Analyzer::Result{Analyzer::Action::None, Analyzer::Terminate::Bail};
@@ -915,7 +913,7 @@ Analyzer::Result valueFlowGenericForward(Token* start, const Token* end, const V
     return Analyzer::Result{ ft.actions, ft.terminate };
 }
 
-Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger* const errorLogger, const Settings& settings)
+Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (Settings::terminated())
         throw TerminateException();

lib/forwardanalyzer.h

@@ -31,9 +31,9 @@ Analyzer::Result valueFlowGenericForward(Token* start,
                                          const Token* end,
                                          const ValuePtr<Analyzer>& a,
                                          const TokenList& tokenList,
-                                         ErrorLogger* const errorLogger,
+                                         ErrorLogger& errorLogger,
                                          const Settings& settings);
 
-Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger* const errorLogger, const Settings& settings);
+Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings);
 
 #endif

lib/reverseanalyzer.cpp

@@ -37,12 +37,12 @@
 
 namespace {
     struct ReverseTraversal {
-        ReverseTraversal(const ValuePtr<Analyzer>& analyzer, const TokenList& tokenlist, ErrorLogger* const errorLogger, const Settings& settings)
+        ReverseTraversal(const ValuePtr<Analyzer>& analyzer, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
             : analyzer(analyzer), tokenlist(tokenlist), errorLogger(errorLogger), settings(settings)
         {}
         ValuePtr<Analyzer> analyzer;
         const TokenList& tokenlist;
-        ErrorLogger* const errorLogger;
+        ErrorLogger& errorLogger;
         const Settings& settings;
 
         std::pair<bool, bool> evalCond(const Token* tok) const {
@@ -395,7 +395,7 @@ namespace {
     };
 }
 
-void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenlist, ErrorLogger* const errorLogger, const Settings& settings)
+void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (a->invalid())
         return;

lib/reverseanalyzer.h

@@ -27,6 +27,6 @@ class TokenList;
 template<class T>
 class ValuePtr;
 
-void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenlist, ErrorLogger* const errorLogger, const Settings& settings);
+void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings);
 
 #endif

lib/tokenize.cpp

@@ -3407,9 +3407,9 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
     if (doValueFlow) {
         if (mTimerResults) {
             Timer t("Tokenizer::simplifyTokens1::ValueFlow", mSettings.showtime, mTimerResults);
-            ValueFlow::setValues(list, *mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
+            ValueFlow::setValues(list, *mSymbolDatabase, *mErrorLogger, mSettings, mTimerResults);
         } else {
-            ValueFlow::setValues(list, *mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
+            ValueFlow::setValues(list, *mSymbolDatabase, *mErrorLogger, mSettings, mTimerResults);
         }
 
         arraySizeAfterValueFlow();