[cfe-commits] r166825 - in /cfe/trunk: lib/CodeGen/CGObjC.cpp test/CodeGenObjC/atomic-aggregate-property.m

[Eli Friedman]

Author: efriedma
Date: Fri Oct 26 17:38:05 2012
New Revision: 166825

URL: http://llvm.org/viewvc/llvm-project?rev=166825&view=rev
Log:
Don't crash synthesizing an ObjC property with an empty struct type.  <rdar://problem/12547611>.


Modified:
    cfe/trunk/lib/CodeGen/CGObjC.cpp
    cfe/trunk/test/CodeGenObjC/atomic-aggregate-property.m

Modified: cfe/trunk/lib/CodeGen/CGObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjC.cpp?rev=166825&r1=166824&r2=166825&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjC.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjC.cpp Fri Oct 26 17:38:05 2012
@@ -810,6 +810,10 @@
   PropertyImplStrategy strategy(CGM, propImpl);
   switch (strategy.getKind()) {
   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);
 
     // Currently, all atomic accesses have to be through integer
@@ -1068,6 +1072,10 @@
   PropertyImplStrategy strategy(CGM, propImpl);
   switch (strategy.getKind()) {
   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()];
 
     LValue ivarLValue =

Modified: cfe/trunk/test/CodeGenObjC/atomic-aggregate-property.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/atomic-aggregate-property.m?rev=166825&r1=166824&r2=166825&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenObjC/atomic-aggregate-property.m (original)
+++ cfe/trunk/test/CodeGenObjC/atomic-aggregate-property.m Fri Oct 26 17:38:05 2012
@@ -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 -x objective-c++ -triple x86_64-apple-darwin10  -fobjc-gc -emit-llvm -o - %s | FileCheck -check-prefix LP64 %s
 // rdar: // 7849824
+// <rdar://problem/12547611>
 
 struct s {
   double a, b, c, d;  
@@ -12,16 +13,20 @@
     id k;
 };
 
+struct s2 {};
+
 @interface A 
 @property (readwrite) double x;
 @property (readwrite) struct s y;
 @property (nonatomic, readwrite) struct s1 z;
+ at property (readwrite) struct s2 a;
 @end
 
 @implementation A
 @synthesize x;
 @synthesize y;
 @synthesize z;
+ at synthesize a;
 @end
 // CHECK-LP64: define internal double @"\01-[A x]"(
 // CHECK-LP64: load atomic i64* {{%.*}} unordered, align 8
@@ -40,3 +45,9 @@
 
 // CHECK-LP64: define internal void @"\01-[A setZ:]"(
 // 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)