Skip to content

Fix false duplicate warnings with string prefix macros #8834

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
tzi4 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −0
Open

Fix false duplicate warnings with string prefix macros #8834

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,6 +1607,11 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
return true;
if (tok1 == nullptr || tok2 == nullptr)
return false;
// An unknown string-prefix macro leaves the literal outside the AST.
// Comparing only the macro name would ignore the rest of the expression.
if ((!tok1->isKeyword() && Token::Match(tok1, "%name% %str%")) ||
(!tok2->isKeyword() && Token::Match(tok2, "%name% %str%")))
return false;
// tokens needs to be from the same TokenList so no need check standard on both of them
if (tok1->isCpp()) {
if (tok1->str() == "." && tok1->astOperand1() && tok1->astOperand1()->str() == "this")
Expand Down
6 changes: 6 additions & 0 deletions test/testastutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,17 @@ class TestAstUtils : public TestFixture {
ASSERT_EQUALS(!cpp, isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } \n", "+", "+", cpp));
ASSERT_EQUALS(true, isSameExpression("void f() {double y = 1e1; double z = 10.0; (x + y) < (x + z); } \n", "+", "+", cpp));
ASSERT_EQUALS(true, isSameExpression("A + A\n", "A", "A", cpp));
// An unknown string-prefix macro leaves the literal outside the AST. #5738
ASSERT_EQUALS(false, isSameExpression("x == PREFIX \"/a\" || x == PREFIX \"/b\";\n", "==", "==", cpp));
ASSERT_EQUALS(false, isSameExpression("x == PREFIX \"/a\" || x == PREFIX;\n", "==", "==", cpp));
ASSERT_EQUALS(false, isSameExpression("x == PREFIX || x == PREFIX \"/a\";\n", "==", "==", cpp));

// the remaining test cases are not valid C code
if (!cpp)
return;

ASSERT_EQUALS(true, isSameExpression("void f(int x) { x ? throw \"a\" : throw \"a\"; }\n", "throw", "throw", cpp));

//https://trac.cppcheck.net/ticket/9700
ASSERT_EQUALS(true, isSameExpression("A::B + A::B;\n", "::", "::", cpp));
ASSERT_EQUALS(false, isSameExpression("A::B + A::C;\n", "::", "::", cpp));
Expand Down
7 changes: 7 additions & 0 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12163,6 +12163,13 @@ class TestOther : public TestFixture {
" return name.startswith(SRCDIR \"/com/\") || name.startswith(SRCDIR \"/uno/\");\n"
"};\n", dinit(CheckOptions, $.inconclusive = false));
ASSERT_EQUALS("", errout_str());

check("bool isInUnoIncludeFile(StringRef name) {\n"
" return isInMainFile()\n"
" ? (name == SRCDIR \"/cppu/compat.cxx\" || name == SRCDIR \"/sal/compat.cxx\")\n"
" : (name.startswith(SRCDIR \"/com/\") || name.startswith(SRCDIR \"/uno/\"));\n"
"}\n", dinit(CheckOptions, $.inconclusive = false));
ASSERT_EQUALS("", errout_str());
}

void raceAfterInterlockedDecrement() {
Expand Down
Loading