Skip to content

Dont stop analysis when an unrelated class variable is changed #3518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 4 commits into from
Oct 23, 2021
Merged

Dont stop analysis when an unrelated class variable is changed #3518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c418a86
Dont stop analysis when a unrelated class variable is changed
pfultz2 Oct 22, 2021
a3da556
Format
pfultz2 Oct 22, 2021
ee5bd11
Fix cppcheck errors
pfultz2 Oct 22, 2021
1789e63
Fix varname
pfultz2 Oct 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ bool isAliased(const Variable *var)
return isAliased(start, var->scope()->bodyEnd, var->declarationId());
}

bool exprDependsOnThis(const Token* expr, nonneg int depth)
bool exprDependsOnThis(const Token* expr, bool onVar, nonneg int depth)
{
if (!expr)
return false;
Expand All @@ -743,13 +743,13 @@ bool exprDependsOnThis(const Token* expr, nonneg int depth)
nestedIn = nestedIn->nestedIn;
}
return nestedIn == expr->function()->nestedIn;
} else if (Token::Match(expr, "%var%") && expr->variable()) {
} else if (onVar && Token::Match(expr, "%var%") && expr->variable()) {
const Variable* var = expr->variable();
return (var->isPrivate() || var->isPublic() || var->isProtected());
}
if (Token::simpleMatch(expr, "."))
return exprDependsOnThis(expr->astOperand1(), depth);
return exprDependsOnThis(expr->astOperand1(), depth) || exprDependsOnThis(expr->astOperand2(), depth);
return exprDependsOnThis(expr->astOperand1(), onVar, depth);
return exprDependsOnThis(expr->astOperand1(), onVar, depth) || exprDependsOnThis(expr->astOperand2(), onVar, depth);
}

static bool hasUnknownVars(const Token* startTok)
Expand Down
2 changes: 1 addition & 1 deletion lib/astutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ bool extractForLoopValues(const Token *forToken,

bool precedes(const Token * tok1, const Token * tok2);

bool exprDependsOnThis(const Token* expr, nonneg int depth = 0);
bool exprDependsOnThis(const Token* expr, bool onVar = true, nonneg int depth = 0);

struct ReferenceToken {
const Token* token;
Expand Down
16 changes: 11 additions & 5 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,8 @@ static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, cons
return false;
}

static bool isContainerSizeChanged(const Token* tok, const Settings* settings = nullptr, int depth = 20);

struct ValueFlowAnalyzer : Analyzer {
const TokenList* tokenlist;
ProgramMemoryState pms;
Expand Down Expand Up @@ -1975,6 +1977,9 @@ struct ValueFlowAnalyzer : Analyzer {
virtual bool dependsOnThis() const {
return false;
}
virtual bool isVariable() const {
return false;
}

virtual bool invalid() const {
return false;
Expand Down Expand Up @@ -2328,8 +2333,7 @@ struct ValueFlowAnalyzer : Analyzer {
if (a != Action::None)
return a;
}

if (dependsOnThis() && exprDependsOnThis(tok))
if (dependsOnThis() && exprDependsOnThis(tok, !isVariable()))
return isThisModified(tok);

// bailout: global non-const variables
Expand Down Expand Up @@ -2672,6 +2676,10 @@ struct ExpressionAnalyzer : SingleValueFlowAnalyzer {
virtual bool isGlobal() const OVERRIDE {
return !local;
}

virtual bool isVariable() const OVERRIDE {
return expr->varId() > 0;
}
};

struct OppositeExpressionAnalyzer : ExpressionAnalyzer {
Expand Down Expand Up @@ -5863,7 +5871,7 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
// ProgramMemory pm = pms.get(endBlock->link()->next(), getProgramState());
for (const auto& p:pm.values) {
nonneg int varid = p.first;
if (!symboldatabase->isVarId(varid))
if (symboldatabase && !symboldatabase->isVarId(varid))
continue;
ValueFlow::Value value = p.second;
if (vars.count(varid) != 0)
Expand Down Expand Up @@ -6354,8 +6362,6 @@ static void valueFlowUninit(TokenList* tokenlist, SymbolDatabase* /*symbolDataba
}
}

static bool isContainerSizeChanged(const Token* tok, const Settings* settings = nullptr, int depth = 20);

static bool isContainerSizeChanged(nonneg int varId,
const Token* start,
const Token* end,
Expand Down
11 changes: 11 additions & 0 deletions test/testvalueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,6 +2464,17 @@ class TestValueFlow : public TestFixture {
ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 0));
ASSERT_EQUALS(false, testValueOfXImpossible(code, 3U, 0));
ASSERT_EQUALS(false, testValueOfXImpossible(code, 3U, 1));

code = "struct A {\n"
" int i, j;\n"
" int foo() {\n"
" i = 1;\n"
" j = 2;\n"
" int x = i;\n"
" return x;\n"
" }\n"
"};\n";
ASSERT_EQUALS(true, testValueOfXKnown(code, 7U, 1));
}

void valueFlowAfterSwap()
Expand Down