Do not give a -Wredundant-move warning when removing the move will result in an

error.

If the object being moved has a move constructor and a deleted copy constructor,
std::move is required, otherwise Clang will give a deleted constructor error.

llvm-svn: 243463

1 files changed, 11 insertions, 1 deletions

diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index ed569635848..fd067775aca 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -5983,9 +5983,19 @@ static void CheckMoveOnConstruction(Sema &S, const Expr *InitExpr,
     if (!VD || !VD->hasLocalStorage())
       return;
 
-    if (!VD->getType()->isRecordType())
+    QualType SourceType = VD->getType();
+    if (!SourceType->isRecordType())
       return;
 
+    if (!S.Context.hasSameUnqualifiedType(DestType, SourceType)) {
+      if (CXXRecordDecl *RD = SourceType->getAsCXXRecordDecl()) {
+        for (auto* Construct : RD->ctors()) {
+          if (Construct->isCopyConstructor() && Construct->isDeleted())
+            return;
+        }
+      }
+    }
+
     // If we're returning a function parameter, copy elision
     // is not possible.
     if (isa<ParmVarDecl>(VD))