diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-26 07:51:39 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-26 07:51:39 +0000 |
| commit | 273c4e9d82fd849e646c64dce2807fd342b483e6 (patch) | |
| tree | 2519706dd4047a2b6381ca7b3c8ad7580f451038 /clang/lib/Sema/SemaExpr.cpp | |
| parent | 2dc867f4e33456fd1f91b8aaa369632ba327ab31 (diff) | |
| download | bcm5719-llvm-273c4e9d82fd849e646c64dce2807fd342b483e6.tar.gz bcm5719-llvm-273c4e9d82fd849e646c64dce2807fd342b483e6.zip | |
Make sure we don't try to produce a definition of an implicitly-deleted function
llvm-svn: 151478
Diffstat (limited to 'clang/lib/Sema/SemaExpr.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 5d6f5ef7f42..10ae8f4badb 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9420,7 +9420,7 @@ void Sema::MarkFunctionReferenced(SourceLocation Loc, FunctionDecl *Func) { // Note that this declaration has been used. if (CXXConstructorDecl *Constructor = dyn_cast<CXXConstructorDecl>(Func)) { - if (Constructor->isDefaulted()) { + if (Constructor->isDefaulted() && !Constructor->isDeleted()) { if (Constructor->isDefaultConstructor()) { if (Constructor->isTrivial()) return; @@ -9438,12 +9438,14 @@ void Sema::MarkFunctionReferenced(SourceLocation Loc, FunctionDecl *Func) { MarkVTableUsed(Loc, Constructor->getParent()); } else if (CXXDestructorDecl *Destructor = dyn_cast<CXXDestructorDecl>(Func)) { - if (Destructor->isDefaulted() && !Destructor->isUsed(false)) + if (Destructor->isDefaulted() && !Destructor->isDeleted() && + !Destructor->isUsed(false)) DefineImplicitDestructor(Loc, Destructor); if (Destructor->isVirtual()) MarkVTableUsed(Loc, Destructor->getParent()); } else if (CXXMethodDecl *MethodDecl = dyn_cast<CXXMethodDecl>(Func)) { - if (MethodDecl->isDefaulted() && MethodDecl->isOverloadedOperator() && + if (MethodDecl->isDefaulted() && !MethodDecl->isDeleted() && + MethodDecl->isOverloadedOperator() && MethodDecl->getOverloadedOperator() == OO_Equal) { if (!MethodDecl->isUsed(false)) { if (MethodDecl->isCopyAssignmentOperator()) |
