Fix #12353 FP duplInheritedMember on deleted method

danmar · Jan 15, 2024 · cd1e0ea · cd1e0ea
1 parent 5ef846a
commit cd1e0ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -3012,7 +3012,8 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
                     (parentClassFuncIt.access != AccessControl::Private || !skipPrivate) &&
                     !classFuncIt.isConstructor() && !classFuncIt.isDestructor() &&
                     classFuncIt.argsMatch(parentClassIt.type->classScope, parentClassFuncIt.argDef, classFuncIt.argDef, emptyString, 0) &&
-                    (classFuncIt.isConst() == parentClassFuncIt.isConst() || Function::returnsConst(&classFuncIt) == Function::returnsConst(&parentClassFuncIt)))
+                    (classFuncIt.isConst() == parentClassFuncIt.isConst() || Function::returnsConst(&classFuncIt) == Function::returnsConst(&parentClassFuncIt)) &&
+                    !(classFuncIt.isDelete() || parentClassFuncIt.isDelete()))
                     results.emplace_back(&classFuncIt, &parentClassFuncIt, &parentClassIt);
             }
         }

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -713,6 +713,17 @@ class TestClass : public TestFixture {
                                   "    const int& get() const { return i; }\n"
                                   "};\n");
         ASSERT_EQUALS("", errout.str());
+
+        checkDuplInheritedMembers("class Base {\n" // #12353
+                                  "    public:\n"
+                                  "        void One();\n"
+                                  "        void Two();\n"
+                                  "};\n"
+                                  "class Derived : public Base {\n"
+                                  "public:\n"
+                                  "    void Two() = delete;\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
 #define checkCopyConstructor(code) checkCopyConstructor_(code, __FILE__, __LINE__)