diff options
author | Alexis Hunt <alercah@gmail.com> | 2011-05-23 21:07:59 +0000 |
---|---|---|
committer | Alexis Hunt <alercah@gmail.com> | 2011-05-23 21:07:59 +0000 |
commit | 1fb4e7621889aeaef0ca9073672360dee81aa329 (patch) | |
tree | 7dd63984ad5d0875ee17bfd67c55db241aedc3a4 /clang/lib/Sema/SemaDeclCXX.cpp | |
parent | 6c4a3190889bc3b7ce842fc4429fa5dc3436e0a3 (diff) | |
download | bcm5719-llvm-1fb4e7621889aeaef0ca9073672360dee81aa329.tar.gz bcm5719-llvm-1fb4e7621889aeaef0ca9073672360dee81aa329.zip |
Correctly propagate defaultedness across template instantiation. This
fixes PR9965, but we're not out of the water yet, as we do not
successfully handle out-of-line definitions, due to my utter
misunderstanding of how we manage templates.
llvm-svn: 131920
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 8bf7cb67b88..9d8ab641f1a 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -2997,7 +2997,8 @@ void Sema::CheckCompletedCXXClass(CXXRecordDecl *Record) { // have inherited constructors. DeclareInheritedConstructors(Record); - CheckExplicitlyDefaultedMethods(Record); + if (!Record->isDependentType()) + CheckExplicitlyDefaultedMethods(Record); } void Sema::CheckExplicitlyDefaultedMethods(CXXRecordDecl *Record) { @@ -8657,6 +8658,12 @@ void Sema::SetDeclDefaulted(Decl *Dcl, SourceLocation DefaultLoc) { CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(Dcl); if (MD) { + if (MD->getParent()->isDependentType()) { + MD->setDefaulted(); + MD->setExplicitlyDefaulted(); + return; + } + CXXSpecialMember Member = getSpecialMember(MD); if (Member == CXXInvalid) { Diag(DefaultLoc, diag::err_default_special_members); |