Skip to content

Fix #14471 (Improve check: shadowVariable for function argument) #8223

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

Open
alim-dotcom wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Open

Fix #14471 (Improve check: shadowVariable for function argument) #8223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4082,12 +4082,28 @@ void CheckOther::checkShadowVariables()
return;
logChecker("CheckOther::checkShadowVariables"); // style
const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();

for (const Scope & scope : symbolDatabase->scopeList) {
if (!scope.isExecutable() || scope.type == ScopeType::eLambda)
continue;
const Scope *functionScope = &scope;
while (functionScope && functionScope->type != ScopeType::eFunction && functionScope->type != ScopeType::eLambda)
functionScope = functionScope->nestedIn;

// Check shadowed variables in the outer scope
if (scope.type == ScopeType::eFunction && scope.function) {
for (const Variable &arg : scope.function->argumentList) {
if (arg.nameToken() && arg.nameToken()->isExpandedMacro())
continue;
const Token *shadowed = findShadowed(scope.nestedIn, arg, arg.nameToken()->linenr());
if (!shadowed)
shadowed = findShadowed(scope.functionOf, arg, arg.nameToken()->linenr());
if (shadowed)
shadowError(arg.nameToken(), shadowed, (shadowed->varId() != 0) ? "variable" : "function");
}
}

// Check shadowed variables in the inner scope
for (const Variable &var : scope.varlist) {
if (var.nameToken() && var.nameToken()->isExpandedMacro()) // #8903
continue;
Expand Down
Loading