[llvm-branch-commits] [cfe-tag] r86740 - in /cfe/tags/Apple/clang/clang/tools/clang: lib/Sema/SemaDeclObjC.cpp test/SemaObjC/continuation-class-err.m

[Ted Kremenek]

Author: kremenek
Date: Tue Nov 10 16:42:01 2009
New Revision: 86740

URL: http://llvm.org/viewvc/llvm-project?rev=86740&view=rev
Log:
Merge in 86297.

Modified:
    cfe/tags/Apple/clang/clang/tools/clang/lib/Sema/SemaDeclObjC.cpp
    cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/continuation-class-err.m

Modified: cfe/tags/Apple/clang/clang/tools/clang/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/lib/Sema/SemaDeclObjC.cpp?rev=86740&r1=86739&r2=86740&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/lib/Sema/SemaDeclObjC.cpp Tue Nov 10 16:42:01 2009
@@ -1911,8 +1911,7 @@
           unsigned PIkind = PIDecl->getPropertyAttributes();
           if (isReadWrite && (PIkind & ObjCPropertyDecl::OBJC_PR_readonly)) {
             unsigned assignRetainCopyNonatomic = 
-              (ObjCPropertyDecl::OBJC_PR_assign |
-               ObjCPropertyDecl::OBJC_PR_retain |
+              (ObjCPropertyDecl::OBJC_PR_retain |
                ObjCPropertyDecl::OBJC_PR_copy |
                ObjCPropertyDecl::OBJC_PR_nonatomic);
             if ((Attributes & assignRetainCopyNonatomic) !=

Modified: cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/continuation-class-err.m
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/continuation-class-err.m?rev=86740&r1=86739&r2=86740&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/continuation-class-err.m (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/continuation-class-err.m Tue Nov 10 16:42:01 2009
@@ -7,11 +7,13 @@
 }
 @property(readonly) id object;	// expected-note {{property declared here}}
 @property(readwrite, assign) id object1; // expected-note {{property declared here}}
+ at property (readonly) int indentLevel;
 @end
 
 @interface ReadOnly ()
 @property(readwrite, copy) id object;	// expected-warning {{property attribute in continuation class does not match the primary class}}
 @property(readonly) id object1; // expected-error {{property declaration in continuation class of 'ReadOnly' is to change a 'readonly' property to 'readwrite'}}
+ at property (readwrite, assign) int indentLevel; // OK. assign the the default in any case.
 @end
 
 @protocol Proto