do not set values if there is no expression

Author: firewave

lib/programmemory.cpp

@@ -45,10 +45,14 @@
 #include <utility>
 #include <vector>
 
-ExprIdToken::ExprIdToken(const Token* tok) : tok(tok), exprid(tok ? tok->exprId() : 0) {}
+ExprIdToken::ExprIdToken(const Token* tok)
+    : tok(tok)
+{
+    assert(tok);
+}
 
 nonneg int ExprIdToken::getExpressionId() const {
-    return tok ? tok->exprId() : exprid;
+    return tok->exprId();
 }
 
 std::size_t ExprIdToken::Hash::operator()(ExprIdToken etok) const
@@ -57,6 +61,9 @@ std::size_t ExprIdToken::Hash::operator()(ExprIdToken etok) const
 }
 
 void ProgramMemory::setValue(const Token* expr, const ValueFlow::Value& value) {
+    if (!expr)
+        return;
+
     copyOnWrite();
 
     (*mValues)[expr] = value;

lib/programmemory.h

@@ -39,7 +39,6 @@ class Settings;
 // Class used to handle heterogeneous lookup in unordered_map(since we can't use C++20 yet)
 struct ExprIdToken {
     const Token* tok = nullptr;
-    nonneg int exprid = 0;
 
     // cppcheck-suppress noExplicitConstructor
     // NOLINTNEXTLINE(google-explicit-constructor)

lib/valueflow.cpp

@@ -6314,6 +6314,8 @@ const Token* ValueFlow::solveExprValue(const Token* expr,
                                        const std::function<std::vector<MathLib::bigint>(const Token*)>& eval,
                                        ValueFlow::Value& value)
 {
+    if (!expr)
+        return nullptr;
     if (!value.isIntValue() && !value.isIteratorValue() && !value.isSymbolicValue())
         return expr;
     if (value.isSymbolicValue() && !Token::Match(expr, "+|-"))

lib/vf_analyzers.cpp

@@ -941,8 +941,11 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
     MultiValueFlowAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const Settings& set)
         : ValueFlowAnalyzer(set) {
         for (const auto& p:args) {
-            values[p.first->declarationId()] = p.second;
-            vars[p.first->declarationId()] = p.first;
+            const auto declId = p.first->declarationId();
+            if (declId == 0)
+                continue; // TODO: should never happen?
+            values[declId] = p.second;
+            vars[declId] = p.first;
         }
     }
 
@@ -1075,6 +1078,7 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
             const Variable* var = vars.at(p.first);
             if (!var)
                 continue;
+            assert(var->nameToken());
             ps[var->nameToken()] = p.second;
         }
         return ps;