From 43c64af5f0fba76d5117668183c7b19ece140fdc Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 21 Apr 2010 19:52:01 +0000 Subject: Keep tack of whether a base in an InitializedEntity is an inherited virtual base or not. Use this in CheckConstructorAccess. llvm-svn: 102020 --- clang/lib/Sema/SemaAccess.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'clang/lib/Sema/SemaAccess.cpp') diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index 1658b699c6b..1a96c26be19 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/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); } -- cgit v1.2.3