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

llvm-svn: 71267
This commit is contained in:
Fariborz Jahanian 2009-05-08 21:10:00 +00:00
parent fdda3501a0
commit 3e68a1facc
2 changed files with 7 additions and 8 deletions

View File

@ -26,8 +26,7 @@ bool Sema::DiagnosePropertyAccessorMismatch(ObjCPropertyDecl *property,
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()

View File

@ -73,11 +73,11 @@ typedef void (F)(void);
NSArray* first;
}
@property (readonly) NSArray* pieces;
@property (readonly) NSMutableArray* first; // expected-warning {{type of property 'first' does not match type of accessor 'first'}}
@property (readonly) NSArray* pieces; // expected-warning {{type of property 'pieces' does not match type of accessor 'pieces'}}
@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 @@ typedef void (F)(void);
- (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