From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Mon, 2 Apr 2012 21:07:48 +0000 (+0000)
Subject: PR10217 diagnostic fix: don't say 'copy constructor' when we mean
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6af6604b905435456f49cd4a37da0ce6e505c38;p=clang

PR10217 diagnostic fix: don't say 'copy constructor' when we mean
'copy assignment operator'.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153897 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 216663607c..a6d564e316 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -4668,7 +4668,7 @@ bool Sema::ShouldDeleteSpecialMember(CXXMethodDecl *MD, CXXSpecialMember CSM,
     if (UserDeclaredMove) {
       Diag(UserDeclaredMove->getLocation(),
            diag::note_deleted_copy_user_declared_move)
-        << (CSM == CXXMoveAssignment) << RD
+        << (CSM == CXXCopyAssignment) << RD
         << UserDeclaredMove->isMoveAssignmentOperator();
       return true;
     }
diff --git a/test/CXX/special/class.copy/implicit-move.cpp b/test/CXX/special/class.copy/implicit-move.cpp
index 7c69dd8b87..b1b298e893 100644
--- a/test/CXX/special/class.copy/implicit-move.cpp
+++ b/test/CXX/special/class.copy/implicit-move.cpp
@@ -28,7 +28,7 @@ struct HasCopyAssignment {
 struct HasMoveConstructor {
   ThrowingCopy tc;
   HasMoveConstructor() noexcept;
-  HasMoveConstructor(HasMoveConstructor &&) noexcept; // expected-note {{deleted because 'HasMoveConstructor' has a user-declared move constructor}}
+  HasMoveConstructor(HasMoveConstructor &&) noexcept; // expected-note {{copy assignment operator is implicitly deleted because 'HasMoveConstructor' has a user-declared move constructor}}
 };
 
 struct HasMoveAssignment { // expected-note {{implicit copy constructor}}