diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/DeclCXX.cpp | 10 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 23 |
2 files changed, 21 insertions, 12 deletions
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index bffa70f18e..8b596e1e7c 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -294,8 +294,9 @@ QualType CXXMethodDecl::getThisType(ASTContext &C) const { } CXXBaseOrMemberInitializer:: -CXXBaseOrMemberInitializer(QualType BaseType, Expr **Args, unsigned NumArgs) - : Args(0), NumArgs(0) { +CXXBaseOrMemberInitializer(QualType BaseType, Expr **Args, unsigned NumArgs, + SourceLocation L) + : Args(0), NumArgs(0), IdLoc(L) { BaseOrMember = reinterpret_cast<uintptr_t>(BaseType.getTypePtr()); assert((BaseOrMember & 0x01) == 0 && "Invalid base class type pointer"); BaseOrMember |= 0x01; @@ -309,8 +310,9 @@ CXXBaseOrMemberInitializer(QualType BaseType, Expr **Args, unsigned NumArgs) } CXXBaseOrMemberInitializer:: -CXXBaseOrMemberInitializer(FieldDecl *Member, Expr **Args, unsigned NumArgs) - : Args(0), NumArgs(0) { +CXXBaseOrMemberInitializer(FieldDecl *Member, Expr **Args, unsigned NumArgs, + SourceLocation L) + : Args(0), NumArgs(0), IdLoc(L) { BaseOrMember = reinterpret_cast<uintptr_t>(Member); assert((BaseOrMember & 0x01) == 0 && "Invalid member pointer"); diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index fffa66c68f..e59236c8a4 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -688,7 +688,8 @@ Sema::ActOnMemInitializer(DeclPtrTy ConstructorD, if (Member) { // FIXME: Perform direct initialization of the member. - return new CXXBaseOrMemberInitializer(Member, (Expr **)Args, NumArgs); + return new CXXBaseOrMemberInitializer(Member, (Expr **)Args, NumArgs, + IdLoc); } // It didn't name a member, so see if it names a class. @@ -750,7 +751,8 @@ Sema::ActOnMemInitializer(DeclPtrTy ConstructorD, return Diag(IdLoc, diag::err_base_init_direct_and_virtual) << MemberOrBase << SourceRange(IdLoc, RParenLoc); - return new CXXBaseOrMemberInitializer(BaseType, (Expr **)Args, NumArgs); + return new CXXBaseOrMemberInitializer(BaseType, (Expr **)Args, NumArgs, + IdLoc); } void Sema::ActOnMemInitializers(DeclPtrTy ConstructorDecl, @@ -766,22 +768,27 @@ void Sema::ActOnMemInitializers(DeclPtrTy ConstructorDecl, Diag(ColonLoc, diag::err_only_constructors_take_base_inits); return; } - llvm::DenseSet<uintptr_t>Members; + llvm::DenseMap<uintptr_t, CXXBaseOrMemberInitializer *>Members; for (unsigned i = 0; i < NumMemInits; i++) { CXXBaseOrMemberInitializer *Member = static_cast<CXXBaseOrMemberInitializer*>(MemInits[i]); - if (Members.count(Member->getBaseOrMember()) == 0) - Members.insert(Member->getBaseOrMember()); + CXXBaseOrMemberInitializer *&PrevMember = Members[Member->getBaseOrMember()]; + if (!PrevMember) + PrevMember = Member; else { if (FieldDecl *Field = Member->getMember()) - Diag(ColonLoc, diag::error_multiple_mem_initialization) - << Field->getNameAsString(); + Diag(Member->getSourceLocation(), + diag::error_multiple_mem_initialization) + << Field->getNameAsString(); else if (Type *BaseClass = Member->getBaseClass()) - Diag(ColonLoc, diag::error_multiple_base_initialization) + Diag(Member->getSourceLocation(), + diag::error_multiple_base_initialization) << BaseClass->getDesugaredType(true); else assert(false && "ActOnMemInitializers - neither field or base"); + Diag(PrevMember->getSourceLocation(), diag::note_previous_initializer) + << 0; } } } |