diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2013-03-25 23:59:42 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2013-03-25 23:59:42 +0000 |
| commit | b501aeb238c9cf03f946778be438f1aca9c29aad (patch) | |
| tree | f5d6158b9a2bb18b9702c9f252aad96c215cc8d4 | |
| parent | 4d553c96ada2b39773ec6fbb6a1d99db829b2c05 (diff) | |
Objective-C: Property declaration overiding one in
its super class or protocols inherit their
availability/deprecated attribute. // rdar://13467644
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177948 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaObjCProperty.cpp | 2 | ||||
| -rw-r--r-- | test/SemaObjC/property-inherited-availability-attr.m | 34 |
2 files changed, 36 insertions, 0 deletions
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp index 121ed8cbb5..c507ab7007 100644 --- a/lib/Sema/SemaObjCProperty.cpp +++ b/lib/Sema/SemaObjCProperty.cpp @@ -127,6 +127,7 @@ CheckPropertyAgainstProtocol(Sema &S, ObjCPropertyDecl *Prop, for (unsigned I = 0, N = R.size(); I != N; ++I) { if (ObjCPropertyDecl *ProtoProp = dyn_cast<ObjCPropertyDecl>(R[I])) { S.DiagnosePropertyMismatch(Prop, ProtoProp, Proto->getIdentifier()); + S.mergeDeclAttributes(Prop, ProtoProp, Sema::AMK_Override); return; } } @@ -209,6 +210,7 @@ Decl *Sema::ActOnProperty(Scope *S, SourceLocation AtLoc, for (unsigned I = 0, N = R.size(); I != N; ++I) { if (ObjCPropertyDecl *SuperProp = dyn_cast<ObjCPropertyDecl>(R[I])) { DiagnosePropertyMismatch(Res, SuperProp, Super->getIdentifier()); + mergeDeclAttributes(Res, SuperProp, AMK_Override); FoundInSuper = true; break; } diff --git a/test/SemaObjC/property-inherited-availability-attr.m b/test/SemaObjC/property-inherited-availability-attr.m new file mode 100644 index 0000000000..6fb57f9d3e --- /dev/null +++ b/test/SemaObjC/property-inherited-availability-attr.m @@ -0,0 +1,34 @@ +// RUN: %clang_cc1 -triple x86_64-apple-macosx10.8.0 -fsyntax-only -verify %s +// rdar://13467644 + +@interface NSObject @end +@protocol myProtocol +@property int myProtocolProperty __attribute__((availability(macosx,introduced=10.7,deprecated=10.8))); +@end + +@interface Foo : NSObject +@property int myProperty __attribute__((availability(macosx,introduced=10.7,deprecated=10.8))); // expected-note {{'myProperty' declared here}} \ + // expected-note {{method 'myProperty' declared here}} \ + // expected-note {{property 'myProperty' is declared deprecated here}} +@end + +@interface Bar : Foo <myProtocol> +@property int myProperty; // expected-note {{'myProperty' declared here}} \ + // expected-note {{method 'myProperty' declared here}} \ + // expected-note {{property 'myProperty' is declared deprecated here}} +@property int myProtocolProperty; // expected-note {{'myProtocolProperty' declared here}} \ + // expected-note {{method 'myProtocolProperty' declared here}} \ + // expected-note {{property 'myProtocolProperty' is declared deprecated here}} +@end + +void test(Foo *y, Bar *x) { + y.myProperty = 0; // expected-warning {{'myProperty' is deprecated: first deprecated in OS X 10.8}} + [y myProperty]; // expected-warning {{'myProperty' is deprecated: first deprecated in OS X 10.8}} + + x.myProperty = 1; // expected-warning {{'myProperty' is deprecated: first deprecated in OS X 10.8}} + [x myProperty]; // expected-warning {{'myProperty' is deprecated: first deprecated in OS X 10.8}} + + x.myProtocolProperty = 0; // expected-warning {{'myProtocolProperty' is deprecated: first deprecated in OS X 10.8}} + + [x myProtocolProperty]; // expected-warning {{'myProtocolProperty' is deprecated: first deprecated in OS X 10.8}} +} |