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

Finishing up block variable layout API by supporting 

union type variables and their nesting inside other
aggregate types.

llvm-svn: 110448
This commit is contained in:
Fariborz Jahanian 2010-08-06 16:28:55 +00:00
parent 027d5bcf89
commit f95e358004
2 changed files with 48 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

@ -1714,6 +1714,7 @@ llvm::Constant *CGObjCCommonMac::GCBlockLayout(CodeGen::CodeGenFunction &CGF,
if ((CGM.getLangOptions().getGCMode() == LangOptions::NonGC) ||
DeclRefs.empty())
return NullPtr;
bool hasUnion = false;
SkipIvars.clear();
IvarsInfo.clear();
unsigned WordSizeInBits = CGM.getContext().Target.getPointerWidth(0);
@ -1727,19 +1728,14 @@ llvm::Constant *CGObjCCommonMac::GCBlockLayout(CodeGen::CodeGenFunction &CGF,
QualType Ty = VD->getType();
assert(!Ty->isArrayType() &&
"Array block variable should have been caught");
if (Ty->isRecordType() && !BDRE->isByRef()) {
bool HasUnion = false;
if ((Ty->isRecordType() || Ty->isUnionType()) && !BDRE->isByRef()) {
BuildAggrIvarRecordLayout(Ty->getAs<RecordType>(),
FieldOffset,
true,
HasUnion);
hasUnion);
continue;
}
// FIXME. Handle none __block Aggregate variables
#if 0
if (Ty->isUnionType() && !BDRE->isByRef())
assert(false && "union block variable layout NYI");
#endif
Qualifiers::GC GCAttr = GetGCAttrTypeForType(CGM.getContext(), Ty);
unsigned FieldSize = CGM.getContext().getTypeSize(Ty);
// __block variables are passed by their descriptior address. So, size
@ -1756,6 +1752,12 @@ llvm::Constant *CGObjCCommonMac::GCBlockLayout(CodeGen::CodeGenFunction &CGF,
if (IvarsInfo.empty())
return NullPtr;
// Sort on byte position in case we encounterred a union nested in
// block variable type's aggregate type.
if (hasUnion && !IvarsInfo.empty())
std::sort(IvarsInfo.begin(), IvarsInfo.end());
if (hasUnion && !SkipIvars.empty())
std::sort(SkipIvars.begin(), SkipIvars.end());
std::string BitMap;
llvm::Constant *C = BuildIvarLayoutBitmap(BitMap);

38
clang/test/CodeGenObjC/block-var-layout.m
View File

@ -72,6 +72,41 @@ void (^d)() = ^{
e();
}
// Test 5 (unions/structs and their nesting):
void Test5() {
struct S5 {
int i1;
id o1;
struct V {
int i2;
id o2;
} v1;
int i3;
union UI {
void * i1;
id o1;
int i3;
id o3;
}ui;
};
union U {
void * i1;
id o1;
int i3;
id o3;
}ui;
struct S5 s2;
union U u2;
void (^c)() = ^{
x(s2.ui.o1);
x(u2.o1);
};
c();
}
// CHECK-LP64: L_OBJC_CLASS_NAME_:
// CHECK-LP64-NEXT: .asciz "A\024"
@ -83,3 +118,6 @@ void (^d)() = ^{
// CHECK-LP64: L_OBJC_CLASS_NAME_11:
// CHECK-LP64-NEXT: .asciz "Q\021\021"
// CHECK-LP64: L_OBJC_CLASS_NAME_14:
// CHECK-LP64-NEXT: .asciz "Q\021\022p"