rule-of-three: Improve last commit

Now it also fixes the second bug
Our previous fix wasn't being run because it was in the if (numImplemeted == 1),
so failed for the case where we have a user-dtor, user-copy-ctor and deleted-copy-assign.

Moving the check out of the if fixes it.

BUG: 388682

1 files changed, 11 insertions, 6 deletions

diff --git a/src/checks/level2/ruleofthree.cpp b/src/checks/level2/ruleofthree.cpp
index 3794d5ac..3baf85ff 100644
--- a/src/checks/level2/ruleofthree.cpp
+++ b/src/checks/level2/ruleofthree.cpp
@@ -67,6 +67,17 @@ void RuleOfThree::VisitDecl(clang::Decl *decl)
     //const bool hasMoveCtor = record->hasNonTrivialMoveConstructor();
     //const bool hasTrivialMoveAssignment = record->hasNonTrivialMoveAssignment();
 
+
+    const bool copyCtorIsDeleted = copyCtor && copyCtor->isDeleted();
+    const bool copyAssignIsDeleted = copyAssign && copyAssign->isDeleted();
+
+    if (hasUserDtor && (copyCtorIsDeleted || copyAssignIsDeleted)) {
+        // One of the copy methods was explicitely deleted, it's safe.
+        // The case we want to catch is when one is user-written and the other is
+        // compiler-generated.
+        return;
+    }
+
     const int numImplemented = hasUserCopyCtor + hasUserCopyAssign + hasUserDtor;
     if (numImplemented == 0 || numImplemented == 3) // Rule of 3 respected
         return;
@@ -101,12 +112,6 @@ void RuleOfThree::VisitDecl(clang::Decl *decl)
         if (destructor->getAccess() == clang::AccessSpecifier::AS_protected)
             return;
 
-        const bool copyCtorIsDeleted = copyCtor && copyCtor->isDeleted();
-        const bool copyAssignIsDeleted = copyAssign && copyAssign->isDeleted();
-
-        if (copyCtorIsDeleted || copyAssignIsDeleted) // One of them was explicitely deleted, it's safe.
-            return;
-
         if (Utils::functionHasEmptyBody(destructor)) {
             // Lets reduce noise and allow the empty dtor. In theory we could warn, but there's no
             // hidden bug behind this dummy dtor.