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

Fix #10405 FN shadowVariable in range-based for loop (#3789)

This commit is contained in:
chrchr-github 2022-02-12 08:10:53 +01:00 committed by GitHub
parent 515649217f
commit c5ab936088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkother.cpp
View File

@ -3261,7 +3261,10 @@ static const Token *findShadowed(const Scope *scope, const std::string &varname,
} }
if (scope->type == Scope::eLambda) if (scope->type == Scope::eLambda)
return nullptr; return nullptr;
return findShadowed(scope->nestedIn, varname, linenr); const Token* shadowed = findShadowed(scope->nestedIn, varname, linenr);
if (!shadowed)
shadowed = findShadowed(scope->functionOf, varname, linenr);
return shadowed;
} }
void CheckOther::checkShadowVariables() void CheckOther::checkShadowVariables()
@ -3293,6 +3296,8 @@ void CheckOther::checkShadowVariables()
} }
const Token *shadowed = findShadowed(scope.nestedIn, var.name(), var.nameToken()->linenr()); const Token *shadowed = findShadowed(scope.nestedIn, var.name(), var.nameToken()->linenr());
if (!shadowed)
shadowed = findShadowed(scope.functionOf, var.name(), var.nameToken()->linenr());
if (!shadowed) if (!shadowed)
continue; continue;
if (scope.type == Scope::eFunction && scope.className == var.name()) if (scope.type == Scope::eFunction && scope.className == var.name())

23
test/testother.cpp
View File

@ -9451,6 +9451,29 @@ private:
" }\n" " }\n"
"};"); "};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("struct S {\n"
" int i{};\n"
" void f() { int i; }\n"
"};\n");
ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Local variable 'i' shadows outer variable\n", errout.str());
check("struct S {\n"
" int i{};\n"
" std::vector<int> v;\n"
" void f() const { for (const int& i : v) {} }\n"
"};\n");
ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Local variable 'i' shadows outer variable\n", errout.str());
check("struct S {\n" // #10405
" F* f{};\n"
" std::list<F> fl;\n"
" void S::f() const;\n"
"};\n"
"void S::f() const {\n"
" for (const F& f : fl) {}\n"
"};\n");
ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:7]: (style) Local variable 'f' shadows outer variable\n", errout.str());
} }
void knownArgument() { void knownArgument() {