dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Decl::getAvailability() rather than checking for the "unavailable" 

attribute when determining whether we need to see an implementation of
a property. Fixes <rdar://problem/12958191>.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171877 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Douglas Gregor 2013-01-08 18:16:18 +00:00
parent cf4a79c3ec
commit 7cdc45751c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Sema/SemaObjCProperty.cpp
View File

@ -1605,7 +1605,8 @@ void Sema::DiagnoseUnimplementedProperties(Scope *S, ObjCImplDecl* IMPDecl,
// Is there a matching propery synthesize/dynamic? // Is there a matching propery synthesize/dynamic?
if (Prop->isInvalidDecl() || if (Prop->isInvalidDecl() ||
Prop->getPropertyImplementation() == ObjCPropertyDecl::Optional || Prop->getPropertyImplementation() == ObjCPropertyDecl::Optional ||
PropImplMap.count(Prop) || Prop->hasAttr<UnavailableAttr>()) PropImplMap.count(Prop) ||
Prop->getAvailability() == AR_Unavailable)
continue; continue;
if (!InsMap.count(Prop->getGetterName())) { if (!InsMap.count(Prop->getGetterName())) {
Diag(IMPDecl->getLocation(), Diag(IMPDecl->getLocation(),

4
test/SemaObjC/no-warning-unavail-unimp.m
View File

@ -1,9 +1,11 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s // RUN: %clang_cc1 -triple x86_64-apple-darwin9 -fsyntax-only -verify -Wno-objc-root-class %s
// expected-no-diagnostics // expected-no-diagnostics
// rdar://9651605 // rdar://9651605
// rdar://12958191
@interface Foo @interface Foo
@property (getter=getVal) int val __attribute__((unavailable)); @property (getter=getVal) int val __attribute__((unavailable));
@property (getter=getVal) int val2 __attribute__((availability(macosx,unavailable)));
- Method __attribute__((unavailable)); - Method __attribute__((unavailable));
+ CMethod __attribute__((unavailable)); + CMethod __attribute__((unavailable));
@end @end