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

Fix #9570 (#3608)

This commit is contained in:
chrchr-github 2021-12-07 07:44:07 +01:00 committed by GitHub
parent 3874c546cc
commit 33c55f77a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/astutils.cpp
View File

@ -1037,6 +1037,9 @@ static bool compareKnownValue(const Token * const tok1, const Token * const tok2
{ {
static const auto isKnownFn = std::mem_fn(&ValueFlow::Value::isKnown); static const auto isKnownFn = std::mem_fn(&ValueFlow::Value::isKnown);
if ((tok1->variable() && tok1->variable()->isStatic()) || (tok2->variable() && tok2->variable()->isStatic()))
return false;
const auto v1 = std::find_if(tok1->values().begin(), tok1->values().end(), isKnownFn); const auto v1 = std::find_if(tok1->values().begin(), tok1->values().end(), isKnownFn);
if (v1 == tok1->values().end()) { if (v1 == tok1->values().end()) {
return false; return false;

8
test/testother.cpp
View File

@ -5593,6 +5593,14 @@ private:
" std::vector<int> v = b ? bar : baz;\n" " std::vector<int> v = b ? bar : baz;\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f(bool q) {\n" // #9570
" static int a = 0;\n"
" static int b = 0;\n"
" int& x = q ? a : b;\n"
" ++x;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
} }
void duplicateExpressionTemplate() { // #6930 void duplicateExpressionTemplate() { // #6930