diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-04-21 19:52:01 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-04-21 19:52:01 +0000 |
| commit | 711f34adb886cce8ba86c7b1b6513a1eaaf63bb5 (patch) | |
| tree | 2924029db55c4ce8e5e78220e02c7aca80c3c434 /lib/Sema/SemaAccess.cpp | |
| parent | 46c54fb8ec45765a475b7b709b9aee7f94c490c2 (diff) | |
Keep tack of whether a base in an InitializedEntity is an inherited virtual base or not. Use this in CheckConstructorAccess.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102020 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaAccess.cpp')
| -rw-r--r-- | lib/Sema/SemaAccess.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index 1658b699c6..1a96c26be1 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -1143,12 +1143,16 @@ Sema::AccessResult Sema::CheckConstructorAccess(SourceLocation UseLoc, AccessEntity.setDiag(diag::err_access_ctor); break; - case InitializedEntity::EK_Base: - AccessEntity.setDiag(PDiag(diag::err_access_ctor_base) + 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; } + } + return CheckAccess(*this, UseLoc, AccessEntity); } |