walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

astutils.cpp: optimized isSameExpression() a bit - reduces average Ir from 294 to 213 when analyzing test folder (#3528)

This commit is contained in:
Oliver Stöneberg 2021-12-11 15:10:15 +01:00 committed by GitHub
parent d0e68e0d77
commit 54b54567cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/astutils.cpp
View File

@ -1068,7 +1068,7 @@ bool isEqualKnownValue(const Token * const tok1, const Token * const tok2)
}); });
} }
bool isDifferentKnownValues(const Token * const tok1, const Token * const tok2) static inline bool isDifferentKnownValues(const Token * const tok1, const Token * const tok2)
{ {
return compareKnownValue(tok1, tok2, [&](const ValueFlow::Value& v1, const ValueFlow::Value& v2, bool sameLifetime) { return compareKnownValue(tok1, tok2, [&](const ValueFlow::Value& v1, const ValueFlow::Value& v2, bool sameLifetime) {
bool r = v1.equalValue(v2); bool r = v1.equalValue(v2);
@ -1079,7 +1079,7 @@ bool isDifferentKnownValues(const Token * const tok1, const Token * const tok2)
}); });
} }
static bool isSameConstantValue(bool macro, const Token * const tok1, const Token * const tok2) static inline bool isSameConstantValue(bool macro, const Token * const tok1, const Token * const tok2)
{ {
if (tok1 == nullptr || tok2 == nullptr) if (tok1 == nullptr || tok2 == nullptr)
return false; return false;
@ -1200,13 +1200,14 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
if (Token::simpleMatch(tok2, "!") && Token::simpleMatch(tok2->astOperand1(), "!") && !Token::simpleMatch(tok2->astParent(), "=")) { if (Token::simpleMatch(tok2, "!") && Token::simpleMatch(tok2->astOperand1(), "!") && !Token::simpleMatch(tok2->astParent(), "=")) {
return isSameExpression(cpp, macro, tok1, tok2->astOperand1()->astOperand1(), library, pure, followVar, errors); return isSameExpression(cpp, macro, tok1, tok2->astOperand1()->astOperand1(), library, pure, followVar, errors);
} }
if (tok1->str() != tok2->str() && isDifferentKnownValues(tok1, tok2)) const bool tok_str_eq = tok1->str() == tok2->str();
if (!tok_str_eq && isDifferentKnownValues(tok1, tok2))
return false; return false;
if (isSameConstantValue(macro, tok1, tok2)) if (isSameConstantValue(macro, tok1, tok2))
return true; return true;
// Follow variable // Follow variable
if (followVar && tok1->str() != tok2->str() && (Token::Match(tok1, "%var%") || Token::Match(tok2, "%var%"))) { if (followVar && !tok_str_eq && (Token::Match(tok1, "%var%") || Token::Match(tok2, "%var%"))) {
const Token * varTok1 = followVariableExpression(tok1, cpp, tok2); const Token * varTok1 = followVariableExpression(tok1, cpp, tok2);
if ((varTok1->str() == tok2->str()) || isSameConstantValue(macro, varTok1, tok2)) { if ((varTok1->str() == tok2->str()) || isSameConstantValue(macro, varTok1, tok2)) {
followVariableExpressionError(tok1, varTok1, errors); followVariableExpressionError(tok1, varTok1, errors);
@ -1224,13 +1225,13 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
} }
} }
// Follow references // Follow references
if (tok1->str() != tok2->str()) { if (!tok_str_eq) {
const Token* refTok1 = followReferences(tok1, errors); const Token* refTok1 = followReferences(tok1, errors);
const Token* refTok2 = followReferences(tok2, errors); const Token* refTok2 = followReferences(tok2, errors);
if (refTok1 != tok1 || refTok2 != tok2) if (refTok1 != tok1 || refTok2 != tok2)
return isSameExpression(cpp, macro, refTok1, refTok2, library, pure, followVar, errors); return isSameExpression(cpp, macro, refTok1, refTok2, library, pure, followVar, errors);
} }
if (tok1->varId() != tok2->varId() || tok1->str() != tok2->str() || tok1->originalName() != tok2->originalName()) { if (tok1->varId() != tok2->varId() || !tok_str_eq || tok1->originalName() != tok2->originalName()) {
if ((Token::Match(tok1,"<|>") && Token::Match(tok2,"<|>")) || if ((Token::Match(tok1,"<|>") && Token::Match(tok2,"<|>")) ||
(Token::Match(tok1,"<=|>=") && Token::Match(tok2,"<=|>="))) { (Token::Match(tok1,"<=|>=") && Token::Match(tok2,"<=|>="))) {
return isSameExpression(cpp, macro, tok1->astOperand1(), tok2->astOperand2(), library, pure, followVar, errors) && return isSameExpression(cpp, macro, tok1->astOperand1(), tok2->astOperand2(), library, pure, followVar, errors) &&

2
lib/astutils.h
View File

@ -171,8 +171,6 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
bool isEqualKnownValue(const Token * const tok1, const Token * const tok2); bool isEqualKnownValue(const Token * const tok1, const Token * const tok2);
bool isDifferentKnownValues(const Token * const tok1, const Token * const tok2);
/** /**
* Is token used a boolean, that is to say cast to a bool, or used as a condition in a if/while/for * Is token used a boolean, that is to say cast to a bool, or used as a condition in a if/while/for
*/ */