[cfe-commits] r151268 - in /cfe/trunk: lib/Sema/SemaObjCProperty.cpp test/CodeGenObjC/auto-property-synthesize-protocol.m

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Feb 23 12:21:25 2012
New Revision: 151268

URL: http://llvm.org/viewvc/llvm-project?rev=151268&view=rev
Log:
objective-c default synthesis. classes which adopt protocol properties
must still auto synthesize those propeties which have been redeclared 
in the class. // rdar://10907410


Added:
    cfe/trunk/test/CodeGenObjC/auto-property-synthesize-protocol.m
Modified:
    cfe/trunk/lib/Sema/SemaObjCProperty.cpp

Modified: cfe/trunk/lib/Sema/SemaObjCProperty.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaObjCProperty.cpp?rev=151268&r1=151267&r2=151268&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaObjCProperty.cpp (original)
+++ cfe/trunk/lib/Sema/SemaObjCProperty.cpp Thu Feb 23 12:21:25 2012
@@ -1277,7 +1277,8 @@
     for (ObjCProtocolDecl::prop_iterator P = PDecl->prop_begin(),
          E = PDecl->prop_end(); P != E; ++P) {
       ObjCPropertyDecl *Prop = (*P);
-      PropMap[Prop->getIdentifier()] = Prop;
+      if (!PropMap.count(Prop->getIdentifier()))
+        PropMap[Prop->getIdentifier()] = Prop;
     }
     // scan through protocol's protocols.
     for (ObjCProtocolDecl::protocol_iterator PI = PDecl->protocol_begin(),

Added: cfe/trunk/test/CodeGenObjC/auto-property-synthesize-protocol.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/auto-property-synthesize-protocol.m?rev=151268&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/auto-property-synthesize-protocol.m (added)
+++ cfe/trunk/test/CodeGenObjC/auto-property-synthesize-protocol.m Thu Feb 23 12:21:25 2012
@@ -0,0 +1,30 @@
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -fobjc-default-synthesize-properties -emit-llvm  %s -o - | FileCheck %s
+// rdar://10907410
+
+ at protocol P
+ at optional
+ at property int auto_opt_window;
+ at property int no_auto_opt_window;
+
+ at required
+ at property int auto_req_window;
+ at property int no_auto_req_window; // expected-note {{property declared here}}
+ at end
+
+ at interface I<P>
+ at property int auto_opt_window;
+ at property int auto_req_window;
+ at end
+
+ at implementation I // expected-warning {{auto property synthesis will not synthesize property declared in a protocol}}
+ at end
+
+// CHECK: define internal i32 @"\01-[I auto_req_window]"(
+// CHECK: define internal void @"\01-[I setAuto_req_window:]"(
+// CHECK: define internal i32 @"\01-[I auto_opt_window]"(
+// CHECK: define internal void @"\01-[I setAuto_opt_window:]"(
+
+// CHECK-NOT: define internal i32 @"\01-[I no_auto_opt_window]"(
+// CHECK-NOT: define internal void @"\01-[I setNo_auto_opt_window:]"(
+// CHECK-NOT: define internal i32 @"\01-[I no_auto_req_window]"(
+// CHECK-NOT: define internal void @"\01-[I setNo_auto_req_window:]"(