Diagnose gc attribute mismatch of property and its ivar.

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

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index cb35890b3f..dc30ac2ea9 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1751,6 +1751,18 @@ Sema::DeclTy *Sema::ActOnPropertyImplDecl(SourceLocation AtLoc,
           << property->getDeclName() << Ivar->getDeclName();
           return 0;
         }
+        // __weak is explicit. So it works on Canonical type.
+        if (PropType.isObjCGCWeak() && !IvarType.isObjCGCWeak()) {
+          Diag(PropertyLoc, diag::error_weak_property)
+          << property->getDeclName() << Ivar->getDeclName();
+          return 0;
+        }
+        if ((Context.isObjCObjectPointerType(property->getType()) || 
+             PropType.isObjCGCStrong()) && IvarType.isObjCGCWeak()) {
+          Diag(PropertyLoc, diag::error_strong_property)
+          << property->getDeclName() << Ivar->getDeclName();
+          return 0;
+        }
       }
     }
   } else if (PropertyIvar) {