commit 1b46d8d78be713c546fb9680eaeea8f793bee5bf
author Fariborz Jahanian <fjahanian@apple.com> Sat Oct 08 17:45:33 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat Oct 08 17:45:33 2011 +0000
tree 10b84af161a0d437f77ebd5a339194cf6f24bb85
parent 54dec5f9ad13597bbebb6872ab938e2ad4b6aa1b

objc: Do not warn about mismatch on Super's readonly property attribute, 
related to a readwrite property, and
Sub's readwrite property. // rdar://9396329


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

lib/Sema/SemaObjCProperty.cpp

diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index 7eb552c..727c7b8 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -899,7 +899,7 @@
       != (SAttr & ObjCPropertyDecl::OBJC_PR_copy))
     Diag(Property->getLocation(), diag::warn_property_attribute)
       << Property->getDeclName() << "copy" << inheritedName;
-  else {
+  else if (!(SAttr & ObjCPropertyDecl::OBJC_PR_readonly)){
     unsigned CAttrRetain = 
       (CAttr & 
        (ObjCPropertyDecl::OBJC_PR_retain | ObjCPropertyDecl::OBJC_PR_strong));