Skip to content

Fix #11827 FP duplInheritedMember - different return type #5231

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 5 commits into from
Jul 12, 2023
Merged

Fix #11827 FP duplInheritedMember - different return type #5231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a14ac3
Fix #11827 FP duplInheritedMember - different return type
chrchr-github Jul 10, 2023
c054ccf
Fix simplification of operator->
chrchr-github Jul 11, 2023
92d5968
Check both . and ->
chrchr-github Jul 11, 2023
7d0106b
Fix
chrchr-github Jul 11, 2023
d212760
Specific operator
chrchr-github Jul 11, 2023
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: 3 additions & 2 deletions lib/checkclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,8 +2468,9 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
auto hasOverloadedMemberAccess = [](const Token* end, const Scope* scope) -> bool {
if (!end || !scope || !Token::simpleMatch(end->astParent(), "."))
return false;
auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [](const Function& f) {
return f.isConst() && f.name() == "operator.";
const std::string op = "operator" + end->astParent()->originalName();
auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [&op](const Function& f) {
return f.isConst() && f.name() == op;
});
if (it == scope->functionList.end() || !it->retType || !it->retType->classScope)
return false;
Expand Down
3 changes: 1 addition & 2 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4396,8 +4396,7 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
// check for matching return parameters
while (!Token::Match(temp1, "virtual|public:|private:|protected:|{|}|;")) {
if (temp1->str() != temp2->str() &&
!(temp1->str() == derivedFromType->name() &&
temp2->str() == baseType->name())) {
!(temp1->type() && temp2->type() && temp2->type()->isDerivedFrom(temp1->type()->name()))) {
match = false;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9778,7 +9778,7 @@ void Tokenizer::simplifyOperatorName()
if (par->str() == "," && !op.empty())
break;
if (!(Token::Match(par, "<|>") && !op.empty())) {
op += par->str();
op += par->str() == "." ? par->originalName() : par->str();
par = par->next();
done = false;
}
Expand Down
23 changes: 23 additions & 0 deletions test/testclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,17 @@ class TestClass : public TestFixture {
" T() : S::T() {}\n"
"};\n");
ASSERT_EQUALS("", errout.str());

checkDuplInheritedMembers("struct S {};\n" // #11827
"struct SPtr {\n"
" virtual S* operator->() const { return p; }\n"
" S* p = nullptr;\n"
"};\n"
"struct T : public S {};\n"
"struct TPtr : public SPtr {\n"
" T* operator->() const { return (T*)p; }\n"
"};\n");
ASSERT_EQUALS("", errout.str());
}

#define checkCopyConstructor(code) checkCopyConstructor_(code, __FILE__, __LINE__)
Expand Down Expand Up @@ -8349,6 +8360,18 @@ class TestClass : public TestFixture {
" friend T f();\n"
"};\n");
ASSERT_EQUALS("", errout.str());

checkOverride("struct S {};\n" // #11827
"struct SPtr {\n"
" virtual S* operator->() const { return p; }\n"
" S* p = nullptr;\n"
"};\n"
"struct T : public S {};\n"
"struct TPtr : public SPtr {\n"
" T* operator->() const { return (T*)p; }\n"
"};\n");
ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:8]: (style) The function 'operator->' overrides a function in a base class but is not marked with a 'override' specifier.\n",
errout.str());
}

void overrideCVRefQualifiers() {
Expand Down
2 changes: 1 addition & 1 deletion test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4950,7 +4950,7 @@ class TestTokenizer : public TestFixture {
const char code[] = "void f() {"
"static_cast<ScToken*>(xResult.operator->())->GetMatrix();"
"}";
const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator. ( ) ) . GetMatrix ( ) ; }";
const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator-> ( ) ) . GetMatrix ( ) ; }";
ASSERT_EQUALS(result, tokenizeAndStringify(code));
}

Expand Down