diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-04-20 05:53:40 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-04-20 05:53:40 +0000 |
| commit | 3eec8aac935eda70975d7d88f1f4a09be90f33c9 (patch) | |
| tree | 18dd65ba73b8d2d37504b28252fb6ea23489d715 /lib/CodeGen | |
| parent | 9da8a683f29a1780f1e0e59d392affedb759bb14 (diff) | |
Don't emit ivar offsets for unnamed bit fields.
Also, added assertion that the field matches what would be looked up.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69572 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/CGObjCMac.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp index e92796b5ba..665e927142 100644 --- a/lib/CodeGen/CGObjCMac.cpp +++ b/lib/CodeGen/CGObjCMac.cpp @@ -4600,13 +4600,16 @@ llvm::Constant *CGObjCNonFragileABIMac::EmitIvarList( unsigned iv = 0; for (RecordDecl::field_iterator e = RD->field_end(CGM.getContext()); i != e; ++i) { + ObjCIvarDecl *IVD = OIvars[iv++]; + // Don't emit entries for unnamed bit fields. + if (!IVD->getDeclName()) + continue; + FieldDecl *Field = *i; - Ivar[0] = EmitIvarOffsetVar(ID->getClassInterface(), OIvars[iv++], + assert(Field == OID->lookupFieldDeclForIvar(CGM.getContext(), IVD)); + Ivar[0] = EmitIvarOffsetVar(ID->getClassInterface(), IVD, GetIvarBaseOffset(Layout, Field)); - if (Field->getIdentifier()) - Ivar[1] = GetMethodVarName(Field->getIdentifier()); - else - Ivar[1] = llvm::Constant::getNullValue(ObjCTypes.Int8PtrTy); + Ivar[1] = GetMethodVarName(Field->getIdentifier()); Ivar[2] = GetMethodVarType(Field); const llvm::Type *FieldTy = CGM.getTypes().ConvertTypeForMem(Field->getType()); |