Skip to content

Commit 5ac4be5

Browse files
firewavefirewave
committed
introduced a cache for followAllReferences() calls
1 parent 5ec627f commit 5ac4be5

8 files changed

Lines changed: 91 additions & 66 deletions

File tree

‎Makefile‎

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

‎lib/astutils.cpp‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect)
10721072
const Token* r = nullptr;
10731073
if (indirect)
10741074
*indirect = 1;
1075-
for (const ReferenceToken& ref : followAllReferences(tok)) {
1075+
for (const ReferenceToken& ref : tok->refs()) {
10761076
const bool pointer = astIsPointer(ref.token);
10771077
r = findAstNode(expr, [&](const Token* childTok) {
10781078
if (childTok->exprId() == 0)
@@ -1253,11 +1253,11 @@ static void followVariableExpressionError(const Token *tok1, const Token *tok2,
12531253
errors->push_back(std::move(item));
12541254
}
12551255

1256-
SmallVector<ReferenceToken> followAllReferences(const Token* tok,
1257-
bool temporary,
1258-
bool inconclusive,
1259-
ErrorPath errors,
1260-
int depth)
1256+
static SmallVector<ReferenceToken> followAllReferencesInternal(const Token* tok,
1257+
bool temporary = true,
1258+
bool inconclusive = true,
1259+
ErrorPath errors = ErrorPath{},
1260+
int depth = 20)
12611261
{
12621262
struct ReferenceTokenLess {
12631263
bool operator()(const ReferenceToken& x, const ReferenceToken& y) const {
@@ -1303,16 +1303,16 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
13031303
return refs_result;
13041304
}
13051305
if (vartok)
1306-
return followAllReferences(vartok, temporary, inconclusive, std::move(errors), depth - 1);
1306+
return followAllReferencesInternal(vartok, temporary, inconclusive, std::move(errors), depth - 1);
13071307
}
13081308
}
13091309
} else if (Token::simpleMatch(tok, "?") && Token::simpleMatch(tok->astOperand2(), ":")) {
13101310
std::set<ReferenceToken, ReferenceTokenLess> result;
13111311
const Token* tok2 = tok->astOperand2();
13121312

1313-
auto refs = followAllReferences(tok2->astOperand1(), temporary, inconclusive, errors, depth - 1);
1313+
auto refs = followAllReferencesInternal(tok2->astOperand1(), temporary, inconclusive, errors, depth - 1);
13141314
result.insert(refs.cbegin(), refs.cend());
1315-
refs = followAllReferences(tok2->astOperand2(), temporary, inconclusive, errors, depth - 1);
1315+
refs = followAllReferencesInternal(tok2->astOperand2(), temporary, inconclusive, errors, depth - 1);
13161316
result.insert(refs.cbegin(), refs.cend());
13171317

13181318
if (!inconclusive && result.size() != 1) {
@@ -1340,7 +1340,7 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
13401340
if (returnTok == tok)
13411341
continue;
13421342
for (const ReferenceToken& rt :
1343-
followAllReferences(returnTok, temporary, inconclusive, errors, depth - returns.size())) {
1343+
followAllReferencesInternal(returnTok, temporary, inconclusive, errors, depth - returns.size())) {
13441344
const Variable* argvar = rt.token->variable();
13451345
if (!argvar) {
13461346
SmallVector<ReferenceToken> refs_result;
@@ -1365,7 +1365,7 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
13651365
er.emplace_back(returnTok, "Return reference.");
13661366
er.emplace_back(tok->previous(), "Called function passing '" + argTok->expressionString() + "'.");
13671367
auto refs =
1368-
followAllReferences(argTok, temporary, inconclusive, std::move(er), depth - returns.size());
1368+
followAllReferencesInternal(argTok, temporary, inconclusive, std::move(er), depth - returns.size());
13691369
result.insert(refs.cbegin(), refs.cend());
13701370
if (!inconclusive && result.size() > 1) {
13711371
SmallVector<ReferenceToken> refs_result;
@@ -1386,11 +1386,16 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
13861386
return refs_result;
13871387
}
13881388

1389+
SmallVector<ReferenceToken> followAllReferences(const Token* tok, bool temporary)
1390+
{
1391+
return followAllReferencesInternal(tok, temporary);
1392+
}
1393+
13891394
const Token* followReferences(const Token* tok, ErrorPath* errors)
13901395
{
13911396
if (!tok)
13921397
return nullptr;
1393-
auto refs = followAllReferences(tok, true, false);
1398+
auto refs = followAllReferencesInternal(tok, true, false);
13941399
if (refs.size() == 1) {
13951400
if (errors)
13961401
*errors = std::move(refs.front().errors);

‎lib/astutils.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,7 @@ struct ReferenceToken {
254254
ErrorPath errors;
255255
};
256256

257-
SmallVector<ReferenceToken> followAllReferences(const Token* tok,
258-
bool temporary = true,
259-
bool inconclusive = true,
260-
ErrorPath errors = ErrorPath{},
261-
int depth = 20);
257+
SmallVector<ReferenceToken> followAllReferences(const Token* tok, bool temporary = true);
262258
const Token* followReferences(const Token* tok, ErrorPath* errors = nullptr);
263259

264260
CPPCHECKLIB bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors=nullptr);

‎lib/token.cpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2647,6 +2647,8 @@ Token::Impl::~Impl()
26472647
delete mOriginalName;
26482648
delete mValueType;
26492649
delete mValues;
2650+
delete mRefs;
2651+
delete mRefsTemp;
26502652

26512653
if (mTemplateSimplifierPointers) {
26522654
for (auto *p : *mTemplateSimplifierPointers) {
@@ -2738,3 +2740,16 @@ void Token::templateArgFrom(const Token* fromToken) {
27382740
mImpl->mTemplateArgLineNumber = fromToken ? fromToken->mImpl->mLineNumber : -1;
27392741
mImpl->mTemplateArgColumn = fromToken ? fromToken->mImpl->mColumn : -1;
27402742
}
2743+
2744+
const SmallVector<ReferenceToken>& Token::refs(bool temporary) const
2745+
{
2746+
if (temporary) {
2747+
if (!mImpl->mRefsTemp)
2748+
mImpl->mRefsTemp = new SmallVector<ReferenceToken>(followAllReferences(this, true));
2749+
return *mImpl->mRefsTemp;
2750+
}
2751+
2752+
if (!mImpl->mRefs)
2753+
mImpl->mRefs = new SmallVector<ReferenceToken>(followAllReferences(this, false));
2754+
return *mImpl->mRefs;
2755+
}

‎lib/token.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "config.h"
2525
#include "errortypes.h"
2626
#include "mathlib.h"
27+
#include "smallvector.h"
2728
#include "templatesimplifier.h"
2829
#include "utils.h"
2930
#include "vfvalue.h"
@@ -54,6 +55,7 @@ class ConstTokenRange;
5455
class Token;
5556
struct TokensFrontBack;
5657
class TokenList;
58+
struct ReferenceToken;
5759

5860
struct ScopeInfo2 {
5961
ScopeInfo2(std::string name_, const Token *bodyEnd_, std::set<std::string> usingNamespaces_ = std::set<std::string>()) : name(std::move(name_)), bodyEnd(bodyEnd_), usingNamespaces(std::move(usingNamespaces_)) {}
@@ -167,6 +169,9 @@ class CPPCHECKLIB Token {
167169

168170
TokenDebug mDebug{};
169171

172+
SmallVector<ReferenceToken>* mRefs{};
173+
SmallVector<ReferenceToken>* mRefsTemp{};
174+
170175
void setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value);
171176
bool getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const;
172177

@@ -1353,6 +1358,9 @@ class CPPCHECKLIB Token {
13531358
return mImpl->mValues ? *mImpl->mValues : mEmptyValueList;
13541359
}
13551360

1361+
// provides and caches result of a followAllReferences() call
1362+
const SmallVector<ReferenceToken>& refs(bool temporary = true) const;
1363+
13561364
/**
13571365
* Sets the original name.
13581366
*/

‎lib/valueflow.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3266,7 +3266,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
32663266
}
32673267

32683268
for (const Token* tok2 : toks) {
3269-
for (const ReferenceToken& rt : followAllReferences(tok2, false)) {
3269+
for (const ReferenceToken& rt : tok2->refs(false)) {
32703270
ValueFlow::Value value = master;
32713271
value.tokvalue = rt.token;
32723272
value.errorPath.insert(value.errorPath.begin(), rt.errors.cbegin(), rt.errors.cend());
@@ -3978,7 +3978,7 @@ static void valueFlowForwardConst(Token* start,
39783978
} else {
39793979
[&] {
39803980
// Follow references
3981-
auto refs = followAllReferences(tok);
3981+
const auto& refs = tok->refs();
39823982
auto it = std::find_if(refs.cbegin(), refs.cend(), [&](const ReferenceToken& ref) {
39833983
return ref.token->varId() == var->declarationId();
39843984
});

‎lib/vf_analyzers.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,8 @@ struct ValueFlowAnalyzer : Analyzer {
649649
if (invalid())
650650
return Action::Invalid;
651651
// Follow references
652-
auto refs = followAllReferences(tok);
652+
// TODO: avoid copy
653+
auto refs = tok->refs();
653654
const bool inconclusiveRefs = refs.size() != 1;
654655
if (std::none_of(refs.cbegin(), refs.cend(), [&](const ReferenceToken& ref) {
655656
return tok == ref.token;

0 commit comments

Comments
 (0)