Fix #12311 FP duplInheritedMember for const overload (#5829)

This commit is contained in:
chrchr-github 2024-01-04 20:59:09 +01:00 committed by GitHub
parent 73187e6e12
commit f24c7fdae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions

View File

@ -2988,7 +2988,8 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
if (classFuncIt.name() == parentClassFuncIt.name() &&
(parentClassFuncIt.access != AccessControl::Private || !skipPrivate) &&
!classFuncIt.isConstructor() && !classFuncIt.isDestructor() &&
classFuncIt.argsMatch(parentClassIt.type->classScope, parentClassFuncIt.argDef, classFuncIt.argDef, emptyString, 0))
classFuncIt.argsMatch(parentClassIt.type->classScope, parentClassFuncIt.argDef, classFuncIt.argDef, emptyString, 0) &&
(classFuncIt.isConst() == parentClassFuncIt.isConst() || Function::returnsConst(&classFuncIt) == Function::returnsConst(&parentClassFuncIt)))
results.emplace_back(&classFuncIt, &parentClassFuncIt, &parentClassIt);
}
}

View File

@ -704,6 +704,14 @@ private:
" T* operator->() const { return (T*)p; }\n"
"};\n");
ASSERT_EQUALS("", errout.str());
checkDuplInheritedMembers("struct B { virtual int& get() = 0; };\n" // #12311
"struct D : B {\n"
" int i{};\n"
" int& get() override { return i; }\n"
" const int& get() const { return i; }\n"
"};\n");
ASSERT_EQUALS("", errout.str());
}
#define checkCopyConstructor(code) checkCopyConstructor_(code, __FILE__, __LINE__)