[cfe-commits] r68834 - in /cfe/trunk: lib/Sema/SemaDeclObjC.cpp test/SemaObjC/no-gc-weak-test.m

[Fariborz Jahanian]

Author: fjahanian
Date: Fri Apr 10 17:42:54 2009
New Revision: 68834

URL: http://llvm.org/viewvc/llvm-project?rev=68834&view=rev
Log:
Fix another fallout from defining __weak unconditionally.

Modified:
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp
    cfe/trunk/test/SemaObjC/no-gc-weak-test.m

Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=68834&r1=68833&r2=68834&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Fri Apr 10 17:42:54 2009
@@ -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();

Modified: cfe/trunk/test/SemaObjC/no-gc-weak-test.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/no-gc-weak-test.m?rev=68834&r1=68833&r2=68834&view=diff

==============================================================================
--- cfe/trunk/test/SemaObjC/no-gc-weak-test.m (original)
+++ cfe/trunk/test/SemaObjC/no-gc-weak-test.m Fri Apr 10 17:42:54 2009
@@ -12,3 +12,17 @@
 @end
 
  
+ at interface PVSelectionOverlayView2 
+{
+ id __weak _selectionRect;
+}
+
+ at property(assign) id selectionRect;
+
+ at end
+
+ at implementation PVSelectionOverlayView2
+
+ at synthesize selectionRect = _selectionRect;
+ at end
+