Refactorization: Allocate Token::_values (ValueFlow information) dynamically, reducing size of each token by around 10%

PKEuS · PKEuS · commit 3c8f5b85ae19 · 2017-03-27T18:48:34.000+02:00
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -87,7 +87,7 @@ static bool match(const Token *tok, const std::string &rhs)
 {
     if (tok->str() == rhs)
         return true;
-    if (tok->isName() && !tok->varId() && tok->values.size() == 1U && tok->values.front().isKnown() && MathLib::toString(tok->values.front().intvalue) == rhs)
+    if (tok->isName() && !tok->varId() && tok->values().size() == 1U && tok->values().front().isKnown() && MathLib::toString(tok->values().front().intvalue) == rhs)
         return true;
     return false;
 }
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
@@ -119,7 +119,7 @@ bool CheckAutoVariables::isAutoVarArray(const Token *tok)
 
     // ValueFlow
     if (var->isPointer() && !var->isArgument()) {
-        for (std::list<ValueFlow::Value>::const_iterator it = tok->values.begin(); it != tok->values.end(); ++it) {
+        for (std::list<ValueFlow::Value>::const_iterator it = tok->values().begin(); it != tok->values().end(); ++it) {
             const ValueFlow::Value &val = *it;
             if (val.isTokValue() && isAutoVarArray(val.tokvalue))
                 return true;
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -1132,7 +1132,7 @@ void CheckBufferOverrun::checkGlobalAndLocalVariable()
             if (!value)
                 continue;
 
-            for (std::list<ValueFlow::Value>::const_iterator it = tok->values.begin(); it != tok->values.end(); ++it) {
+            for (std::list<ValueFlow::Value>::const_iterator it = tok->values().begin(); it != tok->values().end(); ++it) {
                 if (!it->isTokValue() || !it->tokvalue)
                     continue;
                 const Variable *var = it->tokvalue->variable();
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -261,8 +261,8 @@ void CheckCondition::checkBadBitmaskCheck()
                                    (parent->str() == "(" && Token::Match(parent->astOperand1(), "if|while")) ||
                                    (parent->str() == "return" && parent->astOperand1() == tok && inBooleanFunction(tok));
 
-            const bool isTrue = (tok->astOperand1()->values.size() == 1 && tok->astOperand1()->values.front().intvalue != 0 && tok->astOperand1()->values.front().isKnown()) ||
-                                (tok->astOperand2()->values.size() == 1 && tok->astOperand2()->values.front().intvalue != 0 && tok->astOperand2()->values.front().isKnown());
+            const bool isTrue = (tok->astOperand1()->values().size() == 1 && tok->astOperand1()->values().front().intvalue != 0 && tok->astOperand1()->values().front().isKnown()) ||
+                                (tok->astOperand2()->values().size() == 1 && tok->astOperand2()->values().front().intvalue != 0 && tok->astOperand2()->values().front().isKnown());
 
             if (isBoolean && isTrue)
                 badBitmaskCheckError(tok);
@@ -1049,7 +1049,7 @@ void CheckCondition::alwaysTrueFalse()
             if (isExpandedMacro)
                 continue;
 
-            alwaysTrueFalseError(tok, tok->values.front().intvalue != 0);
+            alwaysTrueFalseError(tok, tok->values().front().intvalue != 0);
         }
     }
 }
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -474,8 +474,8 @@ static bool findFormat(unsigned int arg, const Token *firstArg,
                  argTok->variable()->dimensionKnown(0) &&
                  argTok->variable()->dimension(0) != 0))) {
         *formatArgTok = argTok->nextArgument();
-        if (!argTok->values.empty() && argTok->values.front().isTokValue() && argTok->values.front().tokvalue && argTok->values.front().tokvalue->tokType() == Token::eString)
-            *formatStringTok = argTok->values.front().tokvalue;
+        if (!argTok->values().empty() && argTok->values().front().isTokValue() && argTok->values().front().tokvalue && argTok->values().front().tokvalue->tokType() == Token::eString)
+            *formatStringTok = argTok->values().front().tokvalue;
         return true;
     }
     return false;
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -547,7 +547,7 @@ void CheckLeakAutoVar::functionCall(const Token *tok, VarInfo *varInfo, const Va
             if (arg->str() == "&")
                 arg = arg->next();
 
-            bool isnull = arg->hasKnownIntValue() && arg->values.front().intvalue == 0;
+            bool isnull = arg->hasKnownIntValue() && arg->values().front().intvalue == 0;
 
             // Is variable allocated?
             if (!isnull && (!af || af->arg == argNr))
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -481,18 +481,18 @@ static bool alwaysTrue(const Token *tok)
 {
     if (!tok)
         return false;
-    if (tok->values.size() == 1U &&
-        tok->values.front().intvalue != 0 &&
-        tok->values.front().isKnown())
+    if (tok->values().size() == 1U &&
+        tok->values().front().intvalue != 0 &&
+        tok->values().front().isKnown())
         return true;
     if (tok->str() == "||")
         return alwaysTrue(tok->astOperand1()) || alwaysTrue(tok->astOperand2());
     if (tok->str() == "true")
         return true;
     return (tok->isComparisonOp() &&
-            tok->values.size() == 1U &&
-            tok->values.front().isKnown() &&
-            tok->values.front().intvalue != 0);
+            tok->values().size() == 1U &&
+            tok->values().front().isKnown() &&
+            tok->values().front().intvalue != 0);
 }
 
 bool CheckMemoryLeakInFunction::test_white_list(const std::string &funcname, const Settings *settings, bool cpp)
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -284,7 +284,7 @@ void CheckOther::warningOldStylePointerCast()
                 tok = tok->next();
 
             const Token *p = tok->tokAt(4);
-            if (p->hasKnownIntValue() && p->values.front().intvalue==0) // Casting nullpointers is safe
+            if (p->hasKnownIntValue() && p->values().front().intvalue==0) // Casting nullpointers is safe
                 continue;
 
             // Is "type" a class?
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
@@ -337,7 +337,7 @@ void CheckType::checkFloatToIntegerOverflow()
                 continue;
 
             const Token *op1 = tok->astOperand1();
-            for (std::list<ValueFlow::Value>::const_iterator it = op1->values.begin(); it != op1->values.end(); ++it) {
+            for (std::list<ValueFlow::Value>::const_iterator it = op1->values().begin(); it != op1->values().end(); ++it) {
                 if (it->valueType != ValueFlow::Value::FLOAT)
                     continue;
                 if (it->inconclusive && !_settings->inconclusive)
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -219,8 +219,8 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<unsigned
     }
 
     else if (tok->isComparisonOp()) {
-        if (tok->values.size() == 1U && tok->values.front().isKnown()) {
-            if (tok->values.front().intvalue)
+        if (tok->values().size() == 1U && tok->values().front().isKnown()) {
+            if (tok->values().front().intvalue)
                 *alwaysTrue = true;
             else
                 *alwaysFalse = true;
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1016,7 +1016,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                            Token::Match(tok, "%name% ;") &&
                            tok->varId() == 0 &&
                            tok->hasKnownIntValue() &&
-                           tok->values.front().intvalue == 0) {
+                           tok->values().front().intvalue == 0) {
                     variables.use(varid1, tok);
                 } else {
                     variables.write(varid1, tok);
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1321,8 +1321,8 @@ void SymbolDatabase::createSymbolDatabaseEnums()
                     ValueFlow::valueFlowConstantFoldAST(rhs, _settings);
 
                     // get constant folded value:
-                    if (rhs && rhs->values.size() == 1U && rhs->values.front().isKnown()) {
-                        enumerator.value = rhs->values.front().intvalue;
+                    if (rhs && rhs->values().size() == 1U && rhs->values().front().isKnown()) {
+                        enumerator.value = rhs->values().front().intvalue;
                         enumerator.value_known = true;
                         value = enumerator.value + 1;
                     }
@@ -1425,8 +1425,8 @@ void SymbolDatabase::createSymbolDatabaseUnknownArrayDimensions()
                         ValueFlow::valueFlowConstantFoldAST(rhs, _settings);
 
                         // get constant folded value:
-                        if (rhs && rhs->values.size() == 1U && rhs->values.front().isKnown()) {
-                            dimension.num = rhs->values.front().intvalue;
+                        if (rhs && rhs->values().size() == 1U && rhs->values().front().isKnown()) {
+                            dimension.num = rhs->values().front().intvalue;
                             dimension.known = true;
                         }
                     }
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -50,14 +50,16 @@ Token::Token(Token **t) :
     _astOperand2(nullptr),
     _astParent(nullptr),
     _originalName(nullptr),
-    valuetype(nullptr)
+    valuetype(nullptr),
+    _values(nullptr)
 {
 }
 
 Token::~Token()
 {
     delete _originalName;
     delete valuetype;
+    delete _values;
 }
 
 void Token::update_property_info()
@@ -213,7 +215,7 @@ void Token::swapWithNext()
         std::swap(_scope, _next->_scope);
         std::swap(_function, _next->_function);
         std::swap(_originalName, _next->_originalName);
-        std::swap(values, _next->values);
+        std::swap(_values, _next->_values);
         std::swap(valuetype, _next->valuetype);
         std::swap(_progressValue, _next->_progressValue);
     }
@@ -236,7 +238,11 @@ void Token::deleteThis()
             _originalName = _next->_originalName;
             _next->_originalName = nullptr;
         }
-        values = _next->values;
+        if (_next->_values) {
+            delete _values;
+            _values = _next->_values;
+            _next->_values = nullptr;
+        }
         if (_next->valuetype) {
             delete valuetype;
             valuetype = _next->valuetype;
@@ -261,7 +267,11 @@ void Token::deleteThis()
             _originalName = _previous->_originalName;
             _previous->_originalName = nullptr;
         }
-        values = _previous->values;
+        if (_previous->_values) {
+            delete _values;
+            _values = _previous->_values;
+            _previous->_values = nullptr;
+        }
         if (_previous->valuetype) {
             delete valuetype;
             valuetype = _previous->valuetype;
@@ -1233,8 +1243,8 @@ static void astStringXml(const Token *tok, std::size_t indent, std::ostream &out
         out << " variable=\"" << tok->variable() << '\"';
     if (tok->function())
         out << " function=\"" << tok->function() << '\"';
-    if (!tok->values.empty())
-        out << " values=\"" << &tok->values << '\"';
+    if (!tok->values().empty())
+        out << " values=\"" << &tok->values() << '\"';
 
     if (!tok->astOperand1() && !tok->astOperand2()) {
         out << "/>" << std::endl;
@@ -1318,19 +1328,19 @@ void Token::printValueFlow(bool xml, std::ostream &out) const
     else
         out << "\n\n##Value flow" << std::endl;
     for (const Token *tok = this; tok; tok = tok->next()) {
-        if (tok->values.empty())
+        if (!tok->_values)
             continue;
         if (xml)
-            out << "    <values id=\"" << &tok->values << "\">" << std::endl;
+            out << "    <values id=\"" << tok->_values << "\">" << std::endl;
         else if (line != tok->linenr())
             out << "Line " << tok->linenr() << std::endl;
         line = tok->linenr();
         if (!xml) {
-            out << "  " << tok->str() << (tok->values.front().isKnown() ? " always " : " possible ");
-            if (tok->values.size() > 1U)
+            out << "  " << tok->str() << (tok->_values->front().isKnown() ? " always " : " possible ");
+            if (tok->_values->size() > 1U)
                 out << '{';
         }
-        for (std::list<ValueFlow::Value>::const_iterator it=tok->values.begin(); it!=tok->values.end(); ++it) {
+        for (std::list<ValueFlow::Value>::const_iterator it=tok->_values->begin(); it!=tok->_values->end(); ++it) {
             if (xml) {
                 out << "      <value ";
                 switch (it->valueType) {
@@ -1357,7 +1367,7 @@ void Token::printValueFlow(bool xml, std::ostream &out) const
             }
 
             else {
-                if (it != tok->values.begin())
+                if (it != tok->_values->begin())
                     out << ",";
                 switch (it->valueType) {
                 case ValueFlow::Value::INT:
@@ -1377,7 +1387,7 @@ void Token::printValueFlow(bool xml, std::ostream &out) const
         }
         if (xml)
             out << "    </values>" << std::endl;
-        else if (tok->values.size() > 1U)
+        else if (tok->_values->size() > 1U)
             out << '}' << std::endl;
         else
             out << std::endl;
@@ -1388,9 +1398,11 @@ void Token::printValueFlow(bool xml, std::ostream &out) const
 
 const ValueFlow::Value * Token::getValueLE(const MathLib::bigint val, const Settings *settings) const
 {
+    if (!_values)
+        return nullptr;
     const ValueFlow::Value *ret = nullptr;
     std::list<ValueFlow::Value>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it) {
+    for (it = _values->begin(); it != _values->end(); ++it) {
         if (it->isIntValue() && it->intvalue <= val) {
             if (!ret || ret->inconclusive || (ret->condition && !it->inconclusive))
                 ret = &(*it);
@@ -1409,9 +1421,11 @@ const ValueFlow::Value * Token::getValueLE(const MathLib::bigint val, const Sett
 
 const ValueFlow::Value * Token::getValueGE(const MathLib::bigint val, const Settings *settings) const
 {
+    if (!_values)
+        return nullptr;
     const ValueFlow::Value *ret = nullptr;
     std::list<ValueFlow::Value>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it) {
+    for (it = _values->begin(); it != _values->end(); ++it) {
         if (it->isIntValue() && it->intvalue >= val) {
             if (!ret || ret->inconclusive || (ret->condition && !it->inconclusive))
                 ret = &(*it);
@@ -1430,10 +1444,12 @@ const ValueFlow::Value * Token::getValueGE(const MathLib::bigint val, const Sett
 
 const Token *Token::getValueTokenMinStrSize() const
 {
+    if (!_values)
+        return nullptr;
     const Token *ret = nullptr;
     std::size_t minsize = ~0U;
     std::list<ValueFlow::Value>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it) {
+    for (it = _values->begin(); it != _values->end(); ++it) {
         if (it->isTokValue() && it->tokvalue && it->tokvalue->tokType() == Token::eString) {
             std::size_t size = getStrSize(it->tokvalue);
             if (!ret || size < minsize) {
@@ -1447,10 +1463,12 @@ const Token *Token::getValueTokenMinStrSize() const
 
 const Token *Token::getValueTokenMaxStrLength() const
 {
+    if (!_values)
+        return nullptr;
     const Token *ret = nullptr;
     std::size_t maxlength = 0U;
     std::list<ValueFlow::Value>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it) {
+    for (it = _values->begin(); it != _values->end(); ++it) {
         if (it->isTokValue() && it->tokvalue && it->tokvalue->tokType() == Token::eString) {
             std::size_t length = getStrLength(it->tokvalue);
             if (!ret || length > maxlength) {
@@ -1474,7 +1492,7 @@ const Token *Token::getValueTokenDeadPointer() const
     const Scope * const functionscope = getfunctionscope(this->scope());
 
     std::list<ValueFlow::Value>::const_iterator it;
-    for (it = values.begin(); it != values.end(); ++it) {
+    for (it = values().begin(); it != values().end(); ++it) {
         // Is this a pointer alias?
         if (!it->isTokValue() || (it->tokvalue && it->tokvalue->str() != "&"))
             continue;
@@ -1502,6 +1520,61 @@ const Token *Token::getValueTokenDeadPointer() const
     return nullptr;
 }
 
+bool Token::addValue(const ValueFlow::Value &value)
+{
+    if (value.isKnown() && _values) {
+        // Clear all other values since value is known
+        _values->clear();
+    }
+
+    if (_values) {
+        // Don't handle more than 10 values for performance reasons
+        // TODO: add setting?
+        if (_values->size() >= 10U)
+            return false;
+
+        // if value already exists, don't add it again
+        std::list<ValueFlow::Value>::iterator it;
+        for (it = _values->begin(); it != _values->end(); ++it) {
+            // different intvalue => continue
+            if (it->intvalue != value.intvalue)
+                continue;
+
+            // different types => continue
+            if (it->valueType != value.valueType)
+                continue;
+            if (value.isTokValue() && (it->tokvalue != value.tokvalue) && (it->tokvalue->str() != value.tokvalue->str()))
+                continue;
+
+            // same value, but old value is inconclusive so replace it
+            if (it->inconclusive && !value.inconclusive) {
+                *it = value;
+                if (it->varId == 0)
+                    it->varId = _varId;
+                break;
+            }
+
+            // Same value already exists, don't  add new value
+            return false;
+        }
+
+        // Add value
+        if (it == values().end()) {
+            ValueFlow::Value v(value);
+            if (v.varId == 0)
+                v.varId = _varId;
+            _values->push_back(v);
+        }
+    } else {
+        ValueFlow::Value v(value);
+        if (v.varId == 0)
+            v.varId = _varId;
+        _values = new std::list<ValueFlow::Value>(1, v);
+    }
+
+    return true;
+}
+
 void Token::assignProgressValues(Token *tok)
 {
     unsigned int total_count = 0;
diff --git a/lib/token.h b/lib/token.h
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ static bool match(const Token *tok, const std::string &rhs)`
`87`	`87`	`{`
`88`	`88`	`if (tok->str() == rhs)`
`89`	`89`	`return true;`
`90`		`- if (tok->isName() && !tok->varId() && tok->values.size() == 1U && tok->values.front().isKnown() && MathLib::toString(tok->values.front().intvalue) == rhs)`
	`90`	`+ if (tok->isName() && !tok->varId() && tok->values().size() == 1U && tok->values().front().isKnown() && MathLib::toString(tok->values().front().intvalue) == rhs)`
`91`	`91`	`return true;`
`92`	`92`	`return false;`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,8 @@ void CheckCondition::checkBadBitmaskCheck()`
`261`	`261`	`(parent->str() == "(" && Token::Match(parent->astOperand1(), "if\|while")) \|\|`
`262`	`262`	`(parent->str() == "return" && parent->astOperand1() == tok && inBooleanFunction(tok));`
`263`	`263`
`264`		`- const bool isTrue = (tok->astOperand1()->values.size() == 1 && tok->astOperand1()->values.front().intvalue != 0 && tok->astOperand1()->values.front().isKnown()) \|\|`
`265`		`- (tok->astOperand2()->values.size() == 1 && tok->astOperand2()->values.front().intvalue != 0 && tok->astOperand2()->values.front().isKnown());`
	`264`	`+ const bool isTrue = (tok->astOperand1()->values().size() == 1 && tok->astOperand1()->values().front().intvalue != 0 && tok->astOperand1()->values().front().isKnown()) \|\|`
	`265`	`+ (tok->astOperand2()->values().size() == 1 && tok->astOperand2()->values().front().intvalue != 0 && tok->astOperand2()->values().front().isKnown());`
`266`	`266`
`267`	`267`	`if (isBoolean && isTrue)`
`268`	`268`	`badBitmaskCheckError(tok);`
`@@ -1049,7 +1049,7 @@ void CheckCondition::alwaysTrueFalse()`
`1049`	`1049`	`if (isExpandedMacro)`
`1050`	`1050`	`continue;`
`1051`	`1051`
`1052`		`- alwaysTrueFalseError(tok, tok->values.front().intvalue != 0);`
	`1052`	`+ alwaysTrueFalseError(tok, tok->values().front().intvalue != 0);`
`1053`	`1053`	`}`
`1054`	`1054`	`}`
`1055`	`1055`	`}`