Skip to content

Fix #15114 FP shadowVariable (global variable prior to declaration) #8947

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
chrchr-github wants to merge 5 commits into
base: main
Choose a base branch
from
+28 −9
Open

Fix #15114 FP shadowVariable (global variable prior to declaration) #8947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5180d7
Update checkother.cpp
chrchr-github Oct 16, 2026
007ab4b
Update testother.cpp
chrchr-github Oct 16, 2026
59569d5
Update checkother.cpp
chrchr-github Oct 19, 2026
480e5d0
Update testother.cpp
chrchr-github Oct 19, 2026
7b8c53c
Update testother.cpp
chrchr-github Oct 19, 2026
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
19 changes: 10 additions & 9 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4221,12 +4221,12 @@ void CheckOtherImpl::funcArgOrderDifferent(const std::string & functionName,
reportError(tokens, Severity::warning, "funcArgOrderDifferent", msg, CWE683, Certainty::normal);
}

static const Token *findShadowed(const Scope *scope, const Variable& var, int linenr)
static const Token *findShadowed(const Scope *scope, const Variable& var)
{
if (!scope)
return nullptr;
for (const Variable &v : scope->varlist) {
if (scope->isExecutable() && v.nameToken()->linenr() > linenr)
if ((scope->isExecutable() || scope->type == ScopeType::eGlobal) && succeeds(v.nameToken(), var.nameToken()))
continue;
if (v.name() == var.name())
return v.nameToken();
Expand All @@ -4240,9 +4240,9 @@ static const Token *findShadowed(const Scope *scope, const Variable& var, int li

if (scope->type == ScopeType::eLambda)
return nullptr;
const Token* shadowed = findShadowed(scope->nestedIn, var, linenr);
const Token* shadowed = findShadowed(scope->nestedIn, var);
if (!shadowed)
shadowed = findShadowed(scope->functionOf, var, linenr);
shadowed = findShadowed(scope->functionOf, var);
return shadowed;
}

Expand Down Expand Up @@ -4276,9 +4276,9 @@ void CheckOtherImpl::checkShadowVariables()
}
}

const Token *shadowed = findShadowed(scope.nestedIn, var, var.nameToken()->linenr());
const Token *shadowed = findShadowed(scope.nestedIn, var);
if (!shadowed)
shadowed = findShadowed(scope.functionOf, var, var.nameToken()->linenr());
shadowed = findShadowed(scope.functionOf, var);
if (!shadowed)
return;
if (scope.type == ScopeType::eFunction && scope.className == var.name())
Expand Down Expand Up @@ -4312,9 +4312,10 @@ void CheckOtherImpl::checkShadowVariables()
void CheckOtherImpl::shadowError(const Token *shadows, const std::string &shadowsType,
const Token *shadowed, const std::string &shadowedType)
{
ErrorPath errorPath;
errorPath.emplace_back(shadowed, "Shadowed " + shadowedType);
errorPath.emplace_back(shadows, "Shadow " + shadowsType);
ErrorPath errorPath{
{shadowed, "Shadowed " + shadowedType},
{shadows, "Shadow " + shadowsType}
};
const std::string &varname = shadows ? shadows->str() : shadowsType;
const std::string ShadowsType = char(std::toupper(shadowsType[0])) + shadowsType.substr(1);
const std::string ShadowedType = char(std::toupper(shadowedType[0])) + shadowedType.substr(1);
Expand Down
18 changes: 18 additions & 0 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13520,6 +13520,24 @@ class TestOther : public TestFixture {

check("struct S { void g(float f) {} void f() {} };\n");
ASSERT_EQUALS("[test.cpp:1:36] -> [test.cpp:1:25]: (style) Argument 'f' shadows outer function [shadowFunction]\n", errout_str());

check("int f() {\n" // #15114
" int i = 0;\n"
" return i;\n"
"}\n"
"int i = 1;\n");
ASSERT_EQUALS("", errout_str());

{
ScopedFile inc("test.h", "int pad1;\nint pad2;\nint pad3;\nint pad4;\nfloat f;\n");
checkP("void g() {\n"
" #include \"test.h\"\n"
" {\n"
" float f;\n"
" }\n"
"}\n");
ASSERT_EQUALS("[test.h:5:7] -> [test.cpp:4:15]: (style) Local variable 'f' shadows outer variable [shadowVariable]\n", errout_str());
}
}

void knownArgument() {
Expand Down
Loading