Skip to content

Fix #12925 false negative: redundantCopyLocalConst #6586

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
Jul 12, 2024
Merged

Fix #12925 false negative: redundantCopyLocalConst #6586

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
7a61735
Update testother.cpp
chrchr-github Jul 11, 2024
4173e7c
Update checkother.cpp
chrchr-github Jul 11, 2024
3180933
Update testother.cpp
chrchr-github Jul 11, 2024
85b9c73
Merge branch 'main' into chr_12927
chrchr-github Jul 12, 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: 5 additions & 3 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2920,9 +2920,11 @@ void CheckOther::checkRedundantCopy()
const Token* startTok = var->nameToken();
if (startTok->strAt(1) == "=") // %type% %name% = ... ;
;
else if (Token::Match(startTok->next(), "(|{") && var->isClass() && var->typeScope()) {
else if (Token::Match(startTok->next(), "(|{") && var->isClass()) {
if (!var->typeScope() && !(var->valueType() && var->valueType()->container))
continue;
// Object is instantiated. Warn if constructor takes arguments by value.
if (constructorTakesReference(var->typeScope()))
if (var->typeScope() && constructorTakesReference(var->typeScope()))
continue;
} else if (Token::simpleMatch(startTok->next(), ";") && startTok->next()->isSplittedVarDeclEq()) {
startTok = startTok->tokAt(2);
Expand All @@ -2934,7 +2936,7 @@ void CheckOther::checkRedundantCopy()
continue;
if (!Token::Match(tok->previous(), "%name% ("))
continue;
if (!Token::Match(tok->link(), ") )| ;")) // bailout for usage like "const A a = getA()+3"
if (!Token::Match(tok->link(), ") )|}| ;")) // bailout for usage like "const A a = getA()+3"
continue;

const Token* dot = tok->astOperand1();
Expand Down
16 changes: 16 additions & 0 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9047,6 +9047,22 @@ class TestOther : public TestFixture {
"[test.cpp:16] -> [test.cpp:18]: (style) The comparison 'c == m->get()' is always true because 'c' and 'm->get()' represent the same value.\n",
errout_str());

check("struct S {\n" // #12925
" const std::string & f() const { return str; }\n"
" std::string str;\n"
"};\n"
"void f(const S* s) {\n"
" const std::string v{ s->f() };\n"
" if (v.empty()) {}\n"
"}\n"
"void g(const S* s) {\n"
" const std::string w(s->f());\n"
" if (w.empty()) {}\n"
"}\n");
ASSERT_EQUALS("[test.cpp:6]: (performance, inconclusive) Use const reference for 'v' to avoid unnecessary data copying.\n"
"[test.cpp:10]: (performance, inconclusive) Use const reference for 'w' to avoid unnecessary data copying.\n",
errout_str());

check("struct T {\n"
" std::string s;\n"
" const std::string& get() const { return s; }\n"
Expand Down