diff options
| -rw-r--r-- | clang/lib/Sema/SemaObjCProperty.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/auto-property-synthesize-protocol.m | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index 5df214fd9fb..d47becc3756 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/lib/Sema/SemaObjCProperty.cpp @@ -1277,7 +1277,8 @@ static void CollectClassPropertyImplementations(ObjCContainerDecl *CDecl, 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(), diff --git a/clang/test/CodeGenObjC/auto-property-synthesize-protocol.m b/clang/test/CodeGenObjC/auto-property-synthesize-protocol.m new file mode 100644 index 00000000000..ca5c095047f --- /dev/null +++ b/clang/test/CodeGenObjC/auto-property-synthesize-protocol.m @@ -0,0 +1,30 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin -fobjc-default-synthesize-properties -emit-llvm %s -o - | FileCheck %s +// rdar://10907410 + +@protocol P +@optional +@property int auto_opt_window; +@property int no_auto_opt_window; + +@required +@property int auto_req_window; +@property int no_auto_req_window; // expected-note {{property declared here}} +@end + +@interface I<P> +@property int auto_opt_window; +@property int auto_req_window; +@end + +@implementation I // expected-warning {{auto property synthesis will not synthesize property declared in a protocol}} +@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:]"( |
