[llvm-branch-commits] [cfe-branch] r71294 - in /cfe/branches/Apple/Dib: lib/Sema/SemaDeclObjC.cpp test/SemaObjC/property-typecheck-1.m

[Mike Stump]

Author: mrs
Date: Fri May  8 18:38:40 2009
New Revision: 71294

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

Fixes a bug in my last patch. Order of types reversed.

Modified:
    cfe/branches/Apple/Dib/lib/Sema/SemaDeclObjC.cpp
    cfe/branches/Apple/Dib/test/SemaObjC/property-typecheck-1.m

Modified: cfe/branches/Apple/Dib/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Sema/SemaDeclObjC.cpp?rev=71294&r1=71293&r2=71294&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Sema/SemaDeclObjC.cpp Fri May  8 18:38:40 2009
@@ -26,8 +26,7 @@
       GetterMethod->getResultType() != property->getType()) {
     AssignConvertType result = Incompatible;
     if (Context.isObjCObjectPointerType(property->getType()))
-      result = CheckAssignmentConstraints(property->getType(), 
-                                          GetterMethod->getResultType());
+      result = CheckAssignmentConstraints(GetterMethod->getResultType(), property->getType());
     if (result != Compatible) {
       Diag(Loc, diag::warn_accessor_property_type_mismatch) 
         << property->getDeclName()

Modified: cfe/branches/Apple/Dib/test/SemaObjC/property-typecheck-1.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/SemaObjC/property-typecheck-1.m?rev=71294&r1=71293&r2=71294&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/test/SemaObjC/property-typecheck-1.m (original)
+++ cfe/branches/Apple/Dib/test/SemaObjC/property-typecheck-1.m Fri May  8 18:38:40 2009
@@ -73,11 +73,11 @@
  NSArray* first;
 }
 
- at property (readonly) NSArray* pieces;
- at property (readonly) NSMutableArray* first; // expected-warning {{type of property 'first' does not match type of accessor 'first'}}
+ at property (readonly) NSArray* pieces;  // expected-warning {{type of property 'pieces' does not match type of accessor 'pieces'}}
+ at property (readonly) NSMutableArray* first; 
 
-- (NSMutableArray*) pieces;
-- (NSArray*) first;	// expected-note {{declared at}}  // expected-note {{declared at}}
+- (NSMutableArray*) pieces; // expected-note {{declared at}} // expected-note {{declared at}}
+- (NSArray*) first;
 @end
 
 @interface Class2  {
@@ -90,12 +90,12 @@
 
 - (id) lastPiece
 {
- return container.pieces;
+ return container.pieces; // expected-warning {{type of property 'pieces' does not match type of accessor 'pieces'}}
 }
 
 - (id)firstPeice
 {
-  return container.first; // expected-warning {{type of property 'first' does not match type of accessor 'first'}}
+  return container.first; 
 }
 @end