From 698bd3113e079624143bd3841c76e5567bf1d7b7 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Tue, 27 Sep 2011 00:23:52 +0000 Subject: [PATCH] objc - don't complain about unimplemented property when conforming protocol declares the property, as well as one of its superclasses. Property will be implemented in the super class. // rdar://10120691 llvm-svn: 140586 --- clang/lib/Sema/SemaObjCProperty.cpp | 3 ++- .../SemaObjC/unimplemented-protocol-prop.m | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index db23c84f2e20..56aa4480fbe6 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/lib/Sema/SemaObjCProperty.cpp @@ -1153,7 +1153,8 @@ void Sema::CollectImmediateProperties(ObjCContainerDecl *CDecl, ObjCPropertyDecl *PropertyFromSuper = SuperPropMap[Prop->getIdentifier()]; // Exclude property for protocols which conform to class's super-class, // as super-class has to implement the property. - if (!PropertyFromSuper || PropertyFromSuper != Prop) { + if (!PropertyFromSuper || + PropertyFromSuper->getIdentifier() != Prop->getIdentifier()) { ObjCPropertyDecl *&PropEntry = PropMap[Prop->getIdentifier()]; if (!PropEntry) PropEntry = Prop; diff --git a/clang/test/SemaObjC/unimplemented-protocol-prop.m b/clang/test/SemaObjC/unimplemented-protocol-prop.m index 0805202c5e09..fa3ed8ef121c 100644 --- a/clang/test/SemaObjC/unimplemented-protocol-prop.m +++ b/clang/test/SemaObjC/unimplemented-protocol-prop.m @@ -19,3 +19,21 @@ // expected-warning {{property 'MyProperty0' requires method 'setMyProperty0:' to be defined}}\ // expected-warning {{property 'MyProperty' requires method 'MyProperty' to be defined}} \ // expected-warning {{property 'MyProperty' requires method 'setMyProperty:' to be defined}} + +// rdar://10120691 +// property is implemented in super class. No warning + +@protocol PROTOCOL1 +@property int MyProp; +@end + +@interface superclass +@property int MyProp; +@end + +@interface childclass : superclass +@end + +@implementation childclass +@end + -- GitLab