diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-07-24 17:23:54 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-07-24 17:23:54 +0000 |
| commit | fc514abac21dbd801e2b665a1a24075c5ff62f44 (patch) | |
| tree | 47030c6f480c60715b1cfeff38efed7669a89a32 /lib/CodeGen/CGObjCMac.cpp | |
| parent | 4c98efdf06f94da20a640aa36f6a4f3284c26bff (diff) | |
Don't use getLLVMFieldNo for bitfields when constructing the ivar layout maps for GC.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76978 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGObjCMac.cpp')
| -rw-r--r-- | lib/CodeGen/CGObjCMac.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp index 4b4605ef76..073b4ac908 100644 --- a/lib/CodeGen/CGObjCMac.cpp +++ b/lib/CodeGen/CGObjCMac.cpp @@ -3042,10 +3042,14 @@ void CGObjCCommonMac::BuildAggrIvarLayout(const ObjCImplementationDecl *OI, for (unsigned i = 0, e = RecFields.size(); i != e; ++i) { FieldDecl *Field = RecFields[i]; uint64_t FieldOffset; - if (RD) - FieldOffset = - Layout->getElementOffset(CGM.getTypes().getLLVMFieldNo(Field)); - else + if (RD) { + if (Field->isBitField()) { + CodeGenTypes::BitFieldInfo Info = CGM.getTypes().getBitFieldInfo(Field); + FieldOffset = Layout->getElementOffset(Info.FieldNo); + } else + FieldOffset = + Layout->getElementOffset(CGM.getTypes().getLLVMFieldNo(Field)); + } else FieldOffset = ComputeIvarBaseOffset(CGM, OI, cast<ObjCIvarDecl>(Field)); // Skip over unnamed or bitfields |