diff options
| author | Ted Kremenek <kremenek@apple.com> | 2013-04-04 05:29:15 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2013-04-04 05:29:15 +0000 |
| commit | d9802dc5391bb2d2dbadc82dd4d594212d754a95 (patch) | |
| tree | 17ae4ee8a353f09064b8df467ce999a6bae175fb | |
| parent | c855ce7ab97aa25c609a5f83e19b27289fede21a (diff) | |
Revert r177948. We decided that we do not want ObjC property redeclarations to inherit "deprecated".
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178743 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, 0 insertions, 36 deletions
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp index 68fb07f8fe..c348a9cb76 100644 --- a/lib/Sema/SemaObjCProperty.cpp +++ b/lib/Sema/SemaObjCProperty.cpp @@ -127,7 +127,6 @@ 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; } } @@ -210,7 +209,6 @@ 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 deleted file mode 100644 index 6fb57f9d3e..0000000000 --- a/test/SemaObjC/property-inherited-availability-attr.m +++ /dev/null @@ -1,34 +0,0 @@ -// 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}} -} |