diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-27 00:23:52 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-27 00:23:52 +0000 |
| commit | 698bd3113e079624143bd3841c76e5567bf1d7b7 (patch) | |
| tree | 294df96598192eaebe40fc3785258b176c525d6f /clang/lib/Sema/SemaObjCProperty.cpp | |
| parent | f6fbfd3f83f7c3be8dca6f0767d73c53b51d5d69 (diff) | |
| download | bcm5719-llvm-698bd3113e079624143bd3841c76e5567bf1d7b7.tar.gz bcm5719-llvm-698bd3113e079624143bd3841c76e5567bf1d7b7.zip | |
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
Diffstat (limited to 'clang/lib/Sema/SemaObjCProperty.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaObjCProperty.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index db23c84f2e2..56aa4480fbe 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; |
