forked from OSchip/llvm-project
Fixes a bug in my last patch. Order of types reversed.
llvm-svn: 71267
This commit is contained in:
parent
fdda3501a0
commit
3e68a1facc
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue