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

Don't crash synthesizing an ObjC property with an empty struct type. <rdar://problem/12547611>. 

llvm-svn: 166825
This commit is contained in:
Eli Friedman 2012-10-26 22:38:05 +00:00
parent 1423a5cfd7
commit 0e84602d5c
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/CodeGen/CGObjC.cpp
View File

@ -810,6 +810,10 @@ CodeGenFunction::generateObjCGetterBody(const ObjCImplementationDecl *classImpl,
PropertyImplStrategy strategy(CGM, propImpl); PropertyImplStrategy strategy(CGM, propImpl);
switch (strategy.getKind()) { switch (strategy.getKind()) {
case PropertyImplStrategy::Native: { case PropertyImplStrategy::Native: {
// We don't need to do anything for a zero-size struct.
if (strategy.getIvarSize().isZero())
return;
LValue LV = EmitLValueForIvar(TypeOfSelfObject(), LoadObjCSelf(), ivar, 0); LValue LV = EmitLValueForIvar(TypeOfSelfObject(), LoadObjCSelf(), ivar, 0);
// Currently, all atomic accesses have to be through integer // Currently, all atomic accesses have to be through integer
@ -1068,6 +1072,10 @@ CodeGenFunction::generateObjCSetterBody(const ObjCImplementationDecl *classImpl,
PropertyImplStrategy strategy(CGM, propImpl); PropertyImplStrategy strategy(CGM, propImpl);
switch (strategy.getKind()) { switch (strategy.getKind()) {
case PropertyImplStrategy::Native: { case PropertyImplStrategy::Native: {
// We don't need to do anything for a zero-size struct.
if (strategy.getIvarSize().isZero())
return;
llvm::Value *argAddr = LocalDeclMap[*setterMethod->param_begin()]; llvm::Value *argAddr = LocalDeclMap[*setterMethod->param_begin()];
LValue ivarLValue = LValue ivarLValue =

11
clang/test/CodeGenObjC/atomic-aggregate-property.m
View File

@ -1,6 +1,7 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o - %s | FileCheck -check-prefix LP64 %s // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o - %s | FileCheck -check-prefix LP64 %s
// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o - %s | FileCheck -check-prefix LP64 %s // RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o - %s | FileCheck -check-prefix LP64 %s
// rdar: // 7849824 // rdar: // 7849824
// <rdar://problem/12547611>
struct s { struct s {
double a, b, c, d; double a, b, c, d;
@ -12,16 +13,20 @@ struct s1 {
id k; id k;
}; };
struct s2 {};
@interface A @interface A
@property (readwrite) double x; @property (readwrite) double x;
@property (readwrite) struct s y; @property (readwrite) struct s y;
@property (nonatomic, readwrite) struct s1 z; @property (nonatomic, readwrite) struct s1 z;
@property (readwrite) struct s2 a;
@end @end
@implementation A @implementation A
@synthesize x; @synthesize x;
@synthesize y; @synthesize y;
@synthesize z; @synthesize z;
@synthesize a;
@end @end
// CHECK-LP64: define internal double @"\01-[A x]"( // CHECK-LP64: define internal double @"\01-[A x]"(
// CHECK-LP64: load atomic i64* {{%.*}} unordered, align 8 // CHECK-LP64: load atomic i64* {{%.*}} unordered, align 8
@ -40,3 +45,9 @@ struct s1 {
// CHECK-LP64: define internal void @"\01-[A setZ:]"( // CHECK-LP64: define internal void @"\01-[A setZ:]"(
// CHECK-LP64: call i8* @objc_memmove_collectable( // CHECK-LP64: call i8* @objc_memmove_collectable(
// CHECK-LP64: define internal void @"\01-[A a]"(
// (do nothing)
// CHECK-LP64: define internal void @"\01-[A setA:]"(
// (do nothing)