Skip to content

Improve unreachableCodeError message #4559

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

Merged
orbitcowboy merged 9 commits into from
Oct 19, 2022
Merged

Improve unreachableCodeError message #4559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
691086f
Update templatesimplifier.cpp
chrchr-github Oct 17, 2022
04116ca
Add tests
chrchr-github Oct 19, 2022
b41a966
Improve unreachableCodeError message
chrchr-github Oct 19, 2022
3fd152e
Update templatesimplifier.cpp
chrchr-github Oct 17, 2022
e760ab5
Add tests
chrchr-github Oct 19, 2022
54e48fa
Improve unreachableCodeError message
chrchr-github Oct 19, 2022
8e7e999
Merge branch 'chr_noreturn' of https://github.com/chrchr-github/cppch…
chrchr-github Oct 19, 2022
9cfd42e
Revert "Update templatesimplifier.cpp"
chrchr-github Oct 19, 2022
4b431bc
Revert "Add tests"
chrchr-github Oct 19, 2022
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
14 changes: 11 additions & 3 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ void CheckOther::checkUnreachableCode()
secondBreak = silencedWarning;

if (!labelInFollowingLoop && !silencedCompilerWarningOnly)
unreachableCodeError(secondBreak, inconclusive);
unreachableCodeError(secondBreak, tok, inconclusive);
tok = Token::findmatch(secondBreak, "[}:]");
} else if (secondBreak->scope() && secondBreak->scope()->isLoopScope() && secondBreak->str() == "}" && tok->str() == "continue") {
redundantContinueError(tok);
Expand All @@ -849,10 +849,18 @@ void CheckOther::duplicateBreakError(const Token *tok, bool inconclusive)
"The second statement can never be executed, and so should be removed.", CWE561, inconclusive ? Certainty::inconclusive : Certainty::normal);
}

void CheckOther::unreachableCodeError(const Token *tok, bool inconclusive)
void CheckOther::unreachableCodeError(const Token *tok, const Token* noreturn, bool inconclusive)
{
std::string msg = "Statements following ";
if (noreturn && noreturn->function())
msg += "noreturn function '" + noreturn->str() + "()'";
else if (noreturn && noreturn->isKeyword())
msg += "'" + noreturn->str() + "'";
else
msg += "return, break, continue, goto or throw";
msg += " will never be executed.";
reportError(tok, Severity::style, "unreachableCode",
"Statements following return, break, continue, goto or throw will never be executed.", CWE561, inconclusive ? Certainty::inconclusive : Certainty::normal);
msg, CWE561, inconclusive ? Certainty::inconclusive : Certainty::normal);
}

void CheckOther::redundantContinueError(const Token *tok)
Expand Down
4 changes: 2 additions & 2 deletions lib/checkother.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ class CPPCHECKLIB CheckOther : public Check {
void duplicateValueTernaryError(const Token *tok);
void duplicateExpressionTernaryError(const Token *tok, ErrorPath errors);
void duplicateBreakError(const Token *tok, bool inconclusive);
void unreachableCodeError(const Token* tok, bool inconclusive);
void unreachableCodeError(const Token* tok, const Token* noreturn, bool inconclusive);
void redundantContinueError(const Token* tok);
void unsignedLessThanZeroError(const Token *tok, const ValueFlow::Value *v, const std::string &varname);
void pointerLessThanZeroError(const Token *tok, const ValueFlow::Value *v);
Expand Down Expand Up @@ -327,7 +327,7 @@ class CPPCHECKLIB CheckOther : public Check {
c.duplicateValueTernaryError(nullptr);
c.duplicateExpressionTernaryError(nullptr, errorPath);
c.duplicateBreakError(nullptr, false);
c.unreachableCodeError(nullptr, false);
c.unreachableCodeError(nullptr, nullptr, false);
c.unsignedLessThanZeroError(nullptr, nullptr, "varname");
c.unsignedPositiveError(nullptr, nullptr, "varname");
c.pointerLessThanZeroError(nullptr, nullptr);
Expand Down
13 changes: 10 additions & 3 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4291,7 +4291,7 @@ class TestOther : public TestFixture {
" return 0;\n"
" foo();\n"
"}", nullptr, false, false, false);
ASSERT_EQUALS("[test.cpp:3]: (style) Statements following return, break, continue, goto or throw will never be executed.\n", errout.str());
ASSERT_EQUALS("[test.cpp:3]: (style) Statements following 'return' will never be executed.\n", errout.str());

check("int foo(int unused) {\n"
" return 0;\n"
Expand All @@ -4312,7 +4312,7 @@ class TestOther : public TestFixture {
" (void)unused2;\n"
" foo();\n"
"}", nullptr, false, false, false);
ASSERT_EQUALS("[test.cpp:5]: (style) Statements following return, break, continue, goto or throw will never be executed.\n", errout.str());
ASSERT_EQUALS("[test.cpp:5]: (style) Statements following 'return' will never be executed.\n", errout.str());

check("int foo() {\n"
" if(bar)\n"
Expand Down Expand Up @@ -4349,7 +4349,7 @@ class TestOther : public TestFixture {
" return 0;\n"
" j=2;\n"
"}", nullptr, false, false, false);
ASSERT_EQUALS("[test.cpp:7]: (style) Statements following return, break, continue, goto or throw will never be executed.\n", errout.str());
ASSERT_EQUALS("[test.cpp:7]: (style) Statements following 'return' will never be executed.\n", errout.str());

check("int foo() {\n"
" return 0;\n"
Expand Down Expand Up @@ -4496,6 +4496,13 @@ class TestOther : public TestFixture {
" return INB(port_1);\n"
"}\n", "test.c");
ASSERT_EQUALS("", errout.str());

check("[[noreturn]] void n();\n"
"void f() {\n"
" n();\n"
" g();\n"
"}\n");
ASSERT_EQUALS("[test.cpp:4]: (style) Statements following noreturn function 'n()' will never be executed.\n", errout.str());
}

void redundantContinue() {
Expand Down