Skip to content

Fix #13059 FP returnByReference with function call #6736

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 2 commits into from
Aug 30, 2024
Merged

Fix #13059 FP returnByReference with function call #6736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6275aa2
Update checkclass.cpp
chrchr-github Aug 29, 2024
a360fc0
Update testclass.cpp
chrchr-github Aug 29, 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: 7 additions & 1 deletion lib/checkclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3327,8 +3327,14 @@ static const Variable* getSingleReturnVar(const Scope* scope) {
if (!start->astOperand1() || start->str() != "return")
return nullptr;
const Token* tok = start->astOperand1();
if (tok->str() == ".")
if (tok->str() == ".") {
const Token* top = tok->astOperand1();
while (Token::Match(top, "[[.]"))
top = top->astOperand1();
if (!Token::Match(top, "%var%"))
return nullptr;
tok = tok->astOperand2();
}
return tok->variable();
}

Expand Down
17 changes: 17 additions & 0 deletions test/testclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9083,6 +9083,23 @@ class TestClass : public TestFixture {
ASSERT_EQUALS("[test.cpp:6]: (performance) Function 'get1()' should return member 'str' by const reference.\n"
"[test.cpp:9]: (performance) Function 'get2()' should return member 'strT' by const reference.\n",
errout_str());

checkReturnByReference("struct S { std::string str; };\n" // #13059
"struct T {\n"
" S temp() const;\n"
" S s[1];\n"
"};\n"
"struct U {\n"
" std::string get1() const {\n"
" return t.temp().str;\n"
" }\n"
" std::string get2() const {\n"
" return t.s[0].str;\n"
" }\n"
" T t;\n"
"};\n");
ASSERT_EQUALS("[test.cpp:10]: (performance) Function 'get2()' should return member 'str' by const reference.\n",
errout_str());
}
};

Expand Down