From: Mike Stump Date: Thu, 13 Aug 2009 18:39:54 +0000 (+0000) Subject: Minor cleanups. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65010da986b2b13fa04c736855ac68183596420e;p=clang Minor cleanups. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78927 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 9146206589..0f33c7b6fd 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -627,6 +627,7 @@ void CodeGenFunction::GenerateVcalls(std::vector &methods, typedef CXXRecordDecl::method_iterator meth_iter; llvm::Constant *m; + // FIXME: audit order for (meth_iter mi = RD->method_begin(), me = RD->method_end(); mi != me; ++mi) { if (mi->isVirtual()) { @@ -758,13 +759,11 @@ llvm::Value *CodeGenFunction::GenerateVtable(const CXXRecordDecl *RD) { continue; const CXXRecordDecl *Base = cast(i->getType()->getAs()->getDecl()); - if (PrimaryBase != Base) { + if (Base != PrimaryBase) GenerateVtableForBase(Base, RD, rtti, methods, false, false, IndirectPrimary); - } } - // FIXME: finish layout for virtual bases // FIXME: Though complete, this is the wrong order for (CXXRecordDecl::base_class_const_iterator i = RD->vbases_begin(), e = RD->vbases_end(); i != e; ++i) {