commit 3fc3dcd80f34cc6750be06fa546c08df0d03652c
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Nov 28 00:23:12 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Nov 28 00:23:12 2011 +0000
tree bf7de9ddbbecc24b40d6b58580cfe94ce7225a7e
parent 1424b308c3c82acce5e23a1bcd0efbfa6dbd0349

[arcmt] Don't add __weak if there is already a GC __weak and make sure to clear
__weak from a readonly property.

llvm-svn: 145210

clang/lib/ARCMigrate/TransGCAttrs.cpp

diff --git a/clang/lib/ARCMigrate/TransGCAttrs.cpp b/clang/lib/ARCMigrate/TransGCAttrs.cpp
index dc22375..607e5a0 100644
--- a/clang/lib/ARCMigrate/TransGCAttrs.cpp
+++ b/clang/lib/ARCMigrate/TransGCAttrs.cpp
@@ -326,7 +326,8 @@
   for (unsigned i = 0, e = AllProps.size(); i != e; ++i) {
     ObjCPropertyDecl *PD = AllProps[i];
     if (PD->getPropertyAttributesAsWritten() &
-          ObjCPropertyDecl::OBJC_PR_assign) {
+          (ObjCPropertyDecl::OBJC_PR_assign |
+           ObjCPropertyDecl::OBJC_PR_readonly)) {
       SourceLocation AtLoc = PD->getAtLoc();
       if (AtLoc.isInvalid())
         continue;