Skip to content

Fix #13218 FP duplicateExpression with nested defines #6918

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
chrchr-github merged 4 commits into from
Oct 18, 2024
Merged

Fix #13218 FP duplicateExpression with nested defines #6918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a964c7
Fix #13218 FP duplicateExpression with nested defines
chrchr-github Oct 14, 2024
3c2ff4f
Update testother.cpp
chrchr-github Oct 14, 2024
d302b61
TODO
chrchr-github Oct 14, 2024
0e0ddaa
Merge branch 'chr_13218' of https://github.com/chrchr-github/cppcheck…
chrchr-github Oct 14, 2024
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
8 changes: 6 additions & 2 deletions lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1547,8 +1547,12 @@ bool compareTokenFlags(const Token* tok1, const Token* tok2, bool macro) {
if (macro) {
if (tok1->isExpandedMacro() != tok2->isExpandedMacro())
return false;
if (tok1->isExpandedMacro() && tok1->getMacroName() != tok2->getMacroName())
return false;
if (tok1->isExpandedMacro()) { // both are macros
if (tok1->getMacroName() != tok2->getMacroName())
return false;
if (tok1->astParent() && tok2->astParent() && tok1->astParent()->isExpandedMacro() && tok1->astParent()->getMacroName() == tok2->astParent()->getMacroName())
return false;
}
if (tok1->isTemplateArg() || tok2->isTemplateArg())
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions test/cfg/bsd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ void nullPointer_setlinebuf(FILE *stream)
// #9323, #9331
void verify_timercmp(struct timeval t)
{
// cppcheck-suppress duplicateExpression
// TODO cppcheck-suppress duplicateExpression
(void)timercmp(&t, &t, <);
// cppcheck-suppress duplicateExpression
// TODO cppcheck-suppress duplicateExpression
(void)timercmp(&t, &t, <=);
(void)timercmp(&t, &t, ==);
(void)timercmp(&t, &t, !=);
// cppcheck-suppress duplicateExpression
// TODO cppcheck-suppress duplicateExpression
(void)timercmp(&t, &t, >=);
// cppcheck-suppress duplicateExpression
// TODO cppcheck-suppress duplicateExpression
(void)timercmp(&t, &t, >);
}

Expand Down
19 changes: 19 additions & 0 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ class TestOther : public TestFixture {
TEST_CASE(duplicateExpression15); // #10650
TEST_CASE(duplicateExpression16); // #10569
TEST_CASE(duplicateExpression17); // #12036
TEST_CASE(duplicateExpression18);
TEST_CASE(duplicateExpressionLoop);
TEST_CASE(duplicateValueTernary);
TEST_CASE(duplicateExpressionTernary); // #6391
Expand Down Expand Up @@ -7485,6 +7486,24 @@ class TestOther : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void duplicateExpression18() {
checkP("#if defined(ABC)\n" // #13218
"#define MACRO1 (0x1)\n"
"#else\n"
"#define MACRO1 (0)\n"
"#endif\n"
"#if defined(XYZ)\n"
"#define MACRO2 (0x2)\n"
"#else\n"
"#define MACRO2 (0)\n"
"#endif\n"
"#define MACRO_ALL (MACRO1 | MACRO2)\n"
"void f() {\n"
" if (MACRO_ALL == 0) {}\n"
"}\n");
ASSERT_EQUALS("", errout_str());
}

void duplicateExpressionLoop() {
check("void f() {\n"
" int a = 1;\n"
Expand Down