From ef46d1817d5b00966f21a927a6a3b5d949aaf988 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 25 Aug 2009 02:07:02 +0000 Subject: [PATCH] Fix ivar layout map generation (hopefully). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@79968 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGObjCMac.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp index 72d80b6fbb..e16c3ee258 100644 --- a/lib/CodeGen/CGObjCMac.cpp +++ b/lib/CodeGen/CGObjCMac.cpp @@ -3050,7 +3050,12 @@ void CGObjCCommonMac::BuildAggrIvarLayout(const ObjCImplementationDecl *OI, if (RD) { if (Field->isBitField()) { CodeGenTypes::BitFieldInfo Info = CGM.getTypes().getBitFieldInfo(Field); - FieldOffset = Layout->getElementOffset(Info.FieldNo); + + const llvm::Type *Ty = + CGM.getTypes().ConvertTypeForMemRecursive(Field->getType()); + uint64_t TypeSize = + CGM.getTypes().getTargetData().getTypeAllocSize(Ty); + FieldOffset = Info.FieldNo * TypeSize; } else FieldOffset = Layout->getElementOffset(CGM.getTypes().getLLVMFieldNo(Field)); -- 2.40.0