diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-04-22 02:35:33 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-04-22 02:35:33 +0000 |
| commit | e448942b76b50d72542f34a7e773030eda939292 (patch) | |
| tree | 7edf661685740d14d46b9dcff2430b88d2612ff3 /clang/lib/Sema/SemaAccess.cpp | |
| parent | acd700a24b6f767413db3d525e06d03e4245aa40 (diff) | |
| download | bcm5719-llvm-e448942b76b50d72542f34a7e773030eda939292.tar.gz bcm5719-llvm-e448942b76b50d72542f34a7e773030eda939292.zip | |
Revert "Unify two diagnostics into one.", it breaks with an assertion failure on bootstrap.
llvm-svn: 102043
Diffstat (limited to 'clang/lib/Sema/SemaAccess.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaAccess.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index af0c5b526ce..f71d36ad7f3 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -1143,13 +1143,14 @@ Sema::AccessResult Sema::CheckConstructorAccess(SourceLocation UseLoc, AccessEntity.setDiag(diag::err_access_ctor); break; - case InitializedEntity::EK_Base: - AccessEntity.setDiag(PDiag(diag::err_access_base) - << Entity.isInheritedVirtualBase() - << Entity.getBaseSpecifier()->getType() - << getSpecialMember(Constructor)); + 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()); break; - + } + case InitializedEntity::EK_Member: { const FieldDecl *Field = cast<FieldDecl>(Entity.getDecl()); AccessEntity.setDiag(PDiag(diag::err_access_ctor_field) |
