Revert r177948. We decided that we do not want ObjC property redeclarations to inher...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178743 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index 68fb07f8feb449ab780067ff7927fb2a3508a1f4..c348a9cb76874d9aa70f6c95ca23172a9de15bc6 100644 (file)
--- 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 (file)
index 6fb57f9..0000000
--- 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}}
-}