diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-04-22 05:40:53 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-04-22 05:40:53 +0000 |
| commit | 3b8c53b619c1c3d77632734d227566071459b9f5 (patch) | |
| tree | e2b10647f9d291d861f96bdd91b6834f59ca8b8a /lib/Sema/SemaAccess.cpp | |
| parent | 7e2f128354f631d44b3f6dbcd4cee1cc04bdf7b1 (diff) | |
Re-land the patch that merges two diagnostics into one now that it passes self-host :)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102050 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaAccess.cpp')
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index f71d36ad7f..af0c5b526c 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -1143,14 +1143,13 @@ Sema::AccessResult Sema::CheckConstructorAccess(SourceLocation UseLoc, AccessEntity.setDiag(diag::err_access_ctor); break; - case InitializedEntity::EK_Base: { - unsigned DiagID = Entity.isInheritedVirtualBase() ? - diag::err_access_ctor_vbase : diag::err_access_ctor_base; - AccessEntity.setDiag(PDiag(DiagID) - << Entity.getBaseSpecifier()->getType()); + case InitializedEntity::EK_Base: + AccessEntity.setDiag(PDiag(diag::err_access_base) + << Entity.isInheritedVirtualBase() + << Entity.getBaseSpecifier()->getType() + << getSpecialMember(Constructor)); break; - } - + case InitializedEntity::EK_Member: { const FieldDecl *Field = cast<FieldDecl>(Entity.getDecl()); AccessEntity.setDiag(PDiag(diag::err_access_ctor_field) |