diff options
author | Fariborz Jahanian <fjahanian@apple.com> | 2009-06-22 20:37:23 +0000 |
---|---|---|
committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-06-22 20:37:23 +0000 |
commit | 18eb69af7938137f5536d8d7cd5ef42d0397d8c5 (patch) | |
tree | 9248ccfdd5eb71da837cccff16967f98de1f355a /clang/lib/Sema/SemaDeclCXX.cpp | |
parent | bd9c94d7af46e9ad888a34c631b26ecc50bf64f1 (diff) | |
download | bcm5719-llvm-18eb69af7938137f5536d8d7cd5ef42d0397d8c5.tar.gz bcm5719-llvm-18eb69af7938137f5536d8d7cd5ef42d0397d8c5.zip |
Changes made per Doug's comments.
llvm-svn: 73897
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 6e174500938..04c569a528a 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -1842,9 +1842,9 @@ Sema::DeclPtrTy Sema::ActOnNamespaceAliasDef(Scope *S, void Sema::DefineImplicitDefaultConstructor(SourceLocation CurrentLocation, CXXConstructorDecl *Constructor) { - if (!Constructor->isDefaultConstructor() || - !Constructor->isImplicit() || Constructor->isUsed()) - return; + assert((Constructor->isImplicit() && Constructor->isDefaultConstructor() && + !Constructor->isUsed()) && + "DefineImplicitDefaultConstructor - call it for implicit default ctor"); CXXRecordDecl *ClassDecl = cast<CXXRecordDecl>(Constructor->getDeclContext()); @@ -1862,7 +1862,7 @@ void Sema::DefineImplicitDefaultConstructor(SourceLocation CurrentLocation, if (CXXConstructorDecl *BaseCtor = BaseClassDecl->getDefaultConstructor(Context)) { if (BaseCtor->isImplicit()) - BaseCtor->setUsed(); + MarkDeclarationReferenced(CurrentLocation, BaseCtor); } else { Diag(CurrentLocation, diag::err_defining_default_ctor) @@ -1887,7 +1887,7 @@ void Sema::DefineImplicitDefaultConstructor(SourceLocation CurrentLocation, if (CXXConstructorDecl *FieldCtor = FieldClassDecl->getDefaultConstructor(Context)) { if (FieldCtor->isImplicit()) - FieldCtor->setUsed(); + MarkDeclarationReferenced(CurrentLocation, FieldCtor); } else { Diag(CurrentLocation, diag::err_defining_default_ctor) |