From 3554b5a37c79551fc48f7322a95b817781ca6f1b Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Fri, 10 Jul 2009 20:13:23 +0000 Subject: Patch to build list of inherited virtual base classes in their order of construction for each class and use it to to check on propery order of base class construction under -Wreorder option. llvm-svn: 75270 --- clang/lib/Sema/SemaDeclCXX.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'clang/lib/Sema/SemaDeclCXX.cpp') diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index b942c9c2750..17726c64f04 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -825,14 +825,24 @@ void Sema::ActOnMemInitializers(DeclPtrTy ConstructorDecl, NumMemInits); // Also issue warning if order of ctor-initializer list does not match order // of 1) base class declarations and 2) order of non-static data members. - // FIXME. proper handling in the presense of virtual base class. llvm::SmallVector AllBaseOrMembers; CXXRecordDecl *ClassDecl = cast(Constructor->getDeclContext()); + // Push virtual bases before others. + for (CXXRecordDecl::base_class_iterator VBase = + ClassDecl->vbases_begin(), + E = ClassDecl->vbases_end(); VBase != E; ++VBase) + AllBaseOrMembers.push_back(VBase->getType()->getAsRecordType()); + for (CXXRecordDecl::base_class_iterator Base = ClassDecl->bases_begin(), - E = ClassDecl->bases_end(); Base != E; ++Base) + E = ClassDecl->bases_end(); Base != E; ++Base) { + // Virtuals are alread in the virtual base list and are constructed + // first. + if (Base->isVirtual()) + continue; AllBaseOrMembers.push_back(Base->getType()->getAsRecordType()); + } for (CXXRecordDecl::field_iterator Field = ClassDecl->field_begin(), E = ClassDecl->field_end(); Field != E; ++Field) -- cgit v1.2.3