use forward declarations for ValueFlow::Value in more cases

lib/checkbufferoverrun.cpp

@@ -35,6 +35,7 @@
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cstdlib>

lib/checkbufferoverrun.h

@@ -25,7 +25,6 @@
 #include "check.h"
 #include "config.h"
 #include "ctu.h"
-#include "vfvalue.h"
 
 #include <cstdint>
 #include <list>
@@ -41,6 +40,11 @@ class Variable;
 struct Dimension;
 enum class Certainty : std::uint8_t;
 
+namespace ValueFlow
+{
+    class Value;
+}
+
 /// @addtogroup Checks
 /// @{
 

lib/checknullpointer.cpp

@@ -32,6 +32,7 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cctype>
@@ -433,6 +434,13 @@ void CheckNullPointer::nullConstantDereference()
     }
 }
 
+void CheckNullPointer::nullPointerError(const Token *tok)
+{
+    ValueFlow::Value v(0);
+    v.setKnown();
+    nullPointerError(tok, "", &v, false);
+}
+
 void CheckNullPointer::nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
 {
     const std::string errmsgcond("$symbol:" + varname + '\n' + ValueFlow::eitherTheConditionIsRedundant(value ? value->condition : nullptr) + " or there is possible null pointer dereference: $symbol.");

lib/checknullpointer.h

@@ -24,7 +24,6 @@
 
 #include "check.h"
 #include "config.h"
-#include "vfvalue.h"
 
 #include <list>
 #include <string>
@@ -35,6 +34,11 @@ class Settings;
 class Token;
 class Tokenizer;
 
+namespace ValueFlow
+{
+    class Value;
+}
+
 /// @addtogroup Checks
 /// @{
 
@@ -85,11 +89,7 @@ class CPPCHECKLIB CheckNullPointer : public Check {
     /** @brief dereferencing null constant (after Tokenizer::simplifyKnownVariables) */
     void nullConstantDereference();
 
-    void nullPointerError(const Token *tok) {
-        ValueFlow::Value v(0);
-        v.setKnown();
-        nullPointerError(tok, "", &v, false);
-    }
+    void nullPointerError(const Token *tok);
     void nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value* value, bool inconclusive);
 
     /** @brief Parse current TU and extract file info */

lib/infer.cpp

@@ -22,6 +22,7 @@
 #include "errortypes.h"
 #include "token.h"
 #include "valueptr.h"
+#include "vfvalue.h"
 
 #include <cassert>
 #include <algorithm>

lib/infer.h

@@ -21,7 +21,6 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "vfvalue.h"
 
 #include <list>
 #include <string>
@@ -30,6 +29,11 @@
 class Token;
 template<class T> class ValuePtr;
 
+namespace ValueFlow
+{
+    class Value;
+}
+
 struct InferModel {
     virtual bool match(const ValueFlow::Value& value) const = 0;
     virtual ValueFlow::Value yield(MathLib::bigint value) const = 0;

lib/symboldatabase.cpp

@@ -35,6 +35,7 @@
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cassert>

lib/valueflow.h

@@ -24,7 +24,6 @@
 #include "config.h"
 #include "errortypes.h"
 #include "mathlib.h"
-#include "vfvalue.h"
 
 #include <cstdlib>
 #include <functional>
@@ -43,6 +42,11 @@ class ValueType;
 class Variable;
 class Scope;
 
+namespace ValueFlow
+{
+    class Value;
+}
+
 namespace ValueFlow {
     /// Constant folding of expression. This can be used before the full ValueFlow has been executed (ValueFlow::setValues).
     const Value * valueFlowConstantFoldAST(Token *expr, const Settings &settings);

lib/vf_common.cpp

@@ -27,6 +27,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include "vf_settokenvalue.h"
 

lib/vf_common.h

@@ -23,7 +23,6 @@
 #include "mathlib.h"
 #include "sourcelocation.h"
 #include "symboldatabase.h"
-#include "vfvalue.h"
 
 #include <cstddef>
 #include <string>
@@ -32,6 +31,11 @@ class Token;
 class Settings;
 class Platform;
 
+namespace ValueFlow
+{
+    class Value;
+}
+
 namespace ValueFlow
 {
     bool getMinMaxValues(const ValueType* vt, const Platform& platform, MathLib::bigint& minValue, MathLib::bigint& maxValue);