From a03613d6e3f38e0ea8f5ebf0d7c9039b9fe35a8d Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 22 Nov 2010 00:03:08 +0000 Subject: [PATCH] Remove FIXME; we don't ever want to lay out empty bases. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@119957 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGRecordLayoutBuilder.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index 0d9c6d4964..9e45df886e 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -487,18 +487,17 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { void CGRecordLayoutBuilder::LayoutNonVirtualBase(const CXXRecordDecl *BaseDecl, uint64_t BaseOffset) { + // Ignore empty bases. + if (BaseDecl->isEmpty()) + return; + + CheckZeroInitializable(BaseDecl); + const ASTRecordLayout &Layout = Types.getContext().getASTRecordLayout(BaseDecl); uint64_t NonVirtualSize = Layout.getNonVirtualSize(); - if (BaseDecl->isEmpty()) { - // FIXME: Lay out empty bases. - return; - } - - CheckZeroInitializable(BaseDecl); - // FIXME: Actually use a better type than [sizeof(BaseDecl) x i8] when we can. AppendPadding(BaseOffset / 8, 1); -- 2.40.0