Skip to content
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

Fix #13544 FN unreachableCode / Fixup #13491 FP unreachableCode for declaration in switch #7219

Merged
merged 7 commits into from
Jan 15, 2025
+41 −2
Merged

Fix #13544 FN unreachableCode / Fixup #13491 FP unreachableCode for declaration in switch #7219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d363a49
Update testother.cpp
chrchr-github Jan 14, 2025
e630baa
Update checkother.cpp
chrchr-github Jan 14, 2025
d443b89
Update checkother.cpp
chrchr-github Jan 14, 2025
38bbe46
Update checkother.cpp
chrchr-github Jan 14, 2025
fe131b8
Update testother.cpp
chrchr-github Jan 14, 2025
34ce2d1
Update checkother.cpp
chrchr-github Jan 14, 2025
6d5623b
Update checkother.cpp
chrchr-github Jan 14, 2025
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
17 changes: 15 additions & 2 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,8 +871,21 @@ static bool isVardeclInSwitch(const Token* tok)
return false;
if (!isNestedInSwitch(tok->scope()))
return false;
const Token* end = Token::findsimplematch(tok, ";");
return end && end->previous()->variable() && end->previous()->variable()->nameToken() == end->previous();
if (const Token* end = Token::findsimplematch(tok, ";")) {
for (const Token* tok2 = tok; tok2 != end; tok2 = tok2->next()) {
if (tok2->isKeyword() && tok2->str() == "case")
return false;
if (tok2->variable() && tok2->variable()->nameToken() == tok2) {
end = tok2->scope()->bodyEnd;
for (const Token* tok3 = tok2; tok3 != end; tok3 = tok3->next()) {
if (tok3->isKeyword())
return tok3->str() == "case";
}
return false;
}
}
}
return false;
}

//---------------------------------------------------------------------------
Expand Down
26 changes: 26 additions & 0 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5710,6 +5710,20 @@ class TestOther : public TestFixture {
"}\n");
ASSERT_EQUALS("", errout_str());

check("int f(int i) {\n"
" switch (i) {\n"
" case 0:\n"
" return 0;\n"
" int a[1];\n"
" case 1:\n"
" case 2:\n"
" a[0] = 5;\n"
" return a[0] + i;\n"
" }\n"
" return 3;\n"
"}\n");
ASSERT_EQUALS("", errout_str());

check("int f(int i) {\n"
" switch (i) {\n"
" case 0:\n"
Expand Down Expand Up @@ -5780,6 +5794,18 @@ class TestOther : public TestFixture {
" return x;\n"
"}\n");
ASSERT_EQUALS("", errout_str());

check("bool f(int x, int y) {\n" // #13544
" switch (x) {\n"
" case 1: {\n"
" return y != 0;\n"
" int z = y + 5;\n"
" return z != 7;\n"
" }\n"
" }\n"
" return false;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:5]: (style) Statements following 'return' will never be executed.\n", errout_str());
}


Expand Down
Loading