maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Avoid recomputing field offsets. 

llvm-svn: 70812
This commit is contained in:
Daniel Dunbar 2009-05-03 23:31:46 +00:00
parent 79be34012f
commit 5b743915c3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/CodeGen/CGObjCMac.cpp
View File

@ -2947,6 +2947,9 @@ void CGObjCCommonMac::BuildAggrIvarLayout(const ObjCImplementationDecl *OI,
FieldDecl *MaxField = 0;
FieldDecl *MaxSkippedField = 0;
FieldDecl *LastFieldBitfield = 0;
uint64_t MaxFieldOffset = 0;
uint64_t MaxSkippedFieldOffset = 0;
uint64_t LastBitfieldOffset = 0;
if (RecFields.empty())
return;
@ -2955,15 +2958,15 @@ void CGObjCCommonMac::BuildAggrIvarLayout(const ObjCImplementationDecl *OI,
for (unsigned i = 0, e = RecFields.size(); i != e; ++i) {
FieldDecl *Field = RecFields[i];
unsigned FieldOffset = GetFieldBaseOffset(OI, Layout, Field);
// Skip over unnamed or bitfields
if (!Field->getIdentifier() || Field->isBitField()) {
LastFieldBitfield = Field;
LastBitfieldOffset = FieldOffset;
continue;
}
unsigned FieldOffset = GetFieldBaseOffset(OI, Layout, Field);
LastFieldBitfield = 0;
QualType FQT = Field->getType();
if (FQT->isRecordType() || FQT->isUnionType()) {
@ -3027,6 +3030,7 @@ void CGObjCCommonMac::BuildAggrIvarLayout(const ObjCImplementationDecl *OI,
if (UnionIvarSize > MaxUnionIvarSize) {
MaxUnionIvarSize = UnionIvarSize;
MaxField = Field;
MaxFieldOffset = FieldOffset;
}
} else {
IvarsInfo.push_back(GC_IVAR(BytePos + FieldOffset,
@ -3042,6 +3046,7 @@ void CGObjCCommonMac::BuildAggrIvarLayout(const ObjCImplementationDecl *OI,
if (UnionIvarSize > MaxSkippedUnionIvarSize) {
MaxSkippedUnionIvarSize = UnionIvarSize;
MaxSkippedField = Field;
MaxSkippedFieldOffset = FieldOffset;
}
} else {
// FIXME: Why the asymmetry, we divide by byte size in bits here?
@ -3057,20 +3062,17 @@ void CGObjCCommonMac::BuildAggrIvarLayout(const ObjCImplementationDecl *OI,
uint64_t BitFieldSize =
BitWidth->EvaluateAsInt(CGM.getContext()).getZExtValue();
GC_IVAR skivar;
skivar.ivar_bytepos = BytePos + GetFieldBaseOffset(OI, Layout,
LastFieldBitfield);
skivar.ivar_bytepos = BytePos + LastBitfieldOffset;
skivar.ivar_size = (BitFieldSize / ByteSizeInBits)
+ ((BitFieldSize % ByteSizeInBits) != 0);
SkipIvars.push_back(skivar);
}
if (MaxField)
IvarsInfo.push_back(GC_IVAR(BytePos + GetFieldBaseOffset(OI, Layout,
MaxField),
IvarsInfo.push_back(GC_IVAR(BytePos + MaxFieldOffset,
MaxUnionIvarSize));
if (MaxSkippedField)
SkipIvars.push_back(GC_IVAR(BytePos + GetFieldBaseOffset(OI, Layout,
MaxSkippedField),
SkipIvars.push_back(GC_IVAR(BytePos + MaxSkippedFieldOffset,
MaxSkippedUnionIvarSize));
}