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
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index e92796b..665e927 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -4600,13 +4600,16 @@
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());