Skip to content

Fix #10469 FP returnTempReference with overloaded operator+= #3678

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
danmar merged 4 commits into from
Jan 12, 2022
Merged

Fix #10469 FP returnTempReference with overloaded operator+= #3678

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
f96faa3
Fix #10469 FP returnTempReference with overloaded operator+=
chrchr-github Jan 5, 2022
c04bc2a
Format
chrchr-github Jan 5, 2022
d157003
clang-tidy
chrchr-github Jan 5, 2022
1a531cf
Merge
chrchr-github Jan 10, 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
9 changes: 8 additions & 1 deletion lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7092,7 +7092,14 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va

ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Variable *callVar, const Variable *funcVar)
{
ValueType::MatchResult res = ValueType::matchParameter(call, funcVar->valueType());
ValueType vt;
const ValueType* pvt = funcVar->valueType();
if (pvt && funcVar->isArray()) {

@pfultz2 pfultz2 Jan 5, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work when array is passed by reference(ie void f(const T (&array)[N]))? Maybe we should call matchParameter first and then if it doesn't match adjust the valuetype if funcVar->isArray()?

@chrchr-github chrchr-github Jan 5, 2022

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works in the sense that there is no FP if I change the test case accordingly. But ValueType can't store the dimension N anyway.

vt = *pvt;
++vt.pointer;
pvt = &vt;
}
ValueType::MatchResult res = ValueType::matchParameter(call, pvt);
if (callVar && ((res == ValueType::MatchResult::SAME && call->container) || res == ValueType::MatchResult::UNKNOWN)) {
const std::string type1 = getTypeString(callVar->typeStartToken());
const std::string type2 = getTypeString(funcVar->typeStartToken());
Expand Down
12 changes: 12 additions & 0 deletions test/testautovariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3305,6 +3305,18 @@ class TestAutoVariables : public TestFixture {
" {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("struct String {\n" // #10469
" void Append(uint8_t Val);\n"
" String& operator+=(const char s[]);\n"
" String& operator+=(const std::string& Str) {\n"
" return operator+=(Str.c_str());\n"
" }\n"
" void operator+=(uint8_t Val) {\n"
" Append(Val);\n"
" }\n"
"};\n");
ASSERT_EQUALS("", errout.str());
}

void danglingLifetimeBorrowedMembers()
Expand Down