commit 0a9217f5462d067435e4fc32307c018350d59d38
author Fariborz Jahanian <fjahanian@apple.com> Fri Apr 10 22:42:54 2009 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Fri Apr 10 22:42:54 2009 +0000
tree eeff69e1bd250cec9bc157110648ab70c905addf
parent 64c2e0762628eba26c100642521b6100c2515cc5

Fix another fallout from defining __weak unconditionally.


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

lib/Sema/SemaDeclObjC.cpp

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 898ecbb..74a0316 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1840,7 +1840,8 @@
         return DeclPtrTy();
       }
       if ((Context.isObjCObjectPointerType(property->getType()) || 
-           PropType.isObjCGCStrong()) && IvarType.isObjCGCWeak()) {
+           PropType.isObjCGCStrong()) && IvarType.isObjCGCWeak() &&
+           getLangOptions().getGCMode() != LangOptions::NonGC) {
         Diag(PropertyLoc, diag::error_strong_property)
         << property->getDeclName() << Ivar->getDeclName();
         return DeclPtrTy();