commit ef46d1817d5b00966f21a927a6a3b5d949aaf988
author Anders Carlsson <andersca@mac.com> Tue Aug 25 02:07:02 2009 +0000
committer Anders Carlsson <andersca@mac.com> Tue Aug 25 02:07:02 2009 +0000
tree fe17537d33155333630fe3142de9ad3ab36510b3
parent 5f49a0c693188a4d9c4165bd5227399475a31426

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

diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 72d80b6..e16c3ee 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -3050,7 +3050,12 @@
     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));