diff options
| author | Tom Stellard <tstellar@redhat.com> | 2019-11-25 12:23:32 -0800 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2019-11-25 13:19:57 -0800 |
| commit | 0e12815566b2f8dd2d3bfe2319e55b3ffb9767ae (patch) | |
| tree | 06a631313823d0a83ea46ede5a1904d4bca60cb1 /clang/lib/Sema/SemaDeclCXX.cpp | |
| parent | 67f0685b4d108946007230b4c358cd43ad1664e9 (diff) | |
| download | bcm5719-llvm-0e12815566b2f8dd2d3bfe2319e55b3ffb9767ae.tar.gz bcm5719-llvm-0e12815566b2f8dd2d3bfe2319e55b3ffb9767ae.zip | |
Revert "[Diagnostics] Put "deprecated copy" warnings into -Wdeprecated-copy"
This reverts commit 9353c5dd0664ea444236e527bf93566e11dc34df.
This commit introduced bot falures for multi-stage bots with -Werror.
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 9c220efebe6..e3ea9788ad5 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -12435,10 +12435,9 @@ static void diagnoseDeprecatedCopyOperation(Sema &S, CXXMethodDecl *CopyOp) { if (UserDeclaredOperation && UserDeclaredOperation->isUserProvided()) { S.Diag(UserDeclaredOperation->getLocation(), - isa<CXXDestructorDecl>(UserDeclaredOperation) - ? diag::warn_deprecated_copy_dtor_operation - : diag::warn_deprecated_copy_operation) - << RD << /*copy assignment*/ !isa<CXXConstructorDecl>(CopyOp); + diag::warn_deprecated_copy_operation) + << RD << /*copy assignment*/!isa<CXXConstructorDecl>(CopyOp) + << /*destructor*/isa<CXXDestructorDecl>(UserDeclaredOperation); } } |
