diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-26 22:12:27 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-26 22:12:27 +0000 |
| commit | 23ef16592009150519830f602fcf2f35c6fa29f4 (patch) | |
| tree | 8b544719c4424b9f0d24d4ec90e9d3c35b7eb759 | |
| parent | a6a9c20c23a8a1f2a856da0af667fb9fb457b0be (diff) | |
| download | bcm5719-llvm-23ef16592009150519830f602fcf2f35c6fa29f4.tar.gz bcm5719-llvm-23ef16592009150519830f602fcf2f35c6fa29f4.zip | |
objc - in matching setter argument type to its property type,
ingore the type qualifiers. // rdar://10156674
llvm-svn: 140571
| -rw-r--r-- | clang/lib/Sema/SemaObjCProperty.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaObjC/arc-setter-property-match.m | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index 6284f36e416..9297bc23c63 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/lib/Sema/SemaObjCProperty.cpp @@ -1481,7 +1481,8 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property, Context.VoidTy) Diag(SetterMethod->getLocation(), diag::err_setter_type_void); if (SetterMethod->param_size() != 1 || - ((*SetterMethod->param_begin())->getType() != property->getType())) { + ((*SetterMethod->param_begin())->getType().getUnqualifiedType() + != property->getType().getUnqualifiedType())) { Diag(property->getLocation(), diag::warn_accessor_property_type_mismatch) << property->getDeclName() diff --git a/clang/test/SemaObjC/arc-setter-property-match.m b/clang/test/SemaObjC/arc-setter-property-match.m new file mode 100644 index 00000000000..ed716106b50 --- /dev/null +++ b/clang/test/SemaObjC/arc-setter-property-match.m @@ -0,0 +1,35 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin11 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -fblocks -verify %s +// rdar://10156674 + +@class NSArray; + +@interface MyClass2 { +@private + NSArray *_names1; + NSArray *_names2; + NSArray *_names3; + NSArray *_names4; +} +@property (readwrite, strong) NSArray *names1; // <-- warning: Type of property.... +- (void)setNames1:(NSArray *)names; +@property (readwrite, strong) __strong NSArray *names2; // <-- warning: Type of property.... +- (void)setNames2:(NSArray *)names; +@property (readwrite, strong) __strong NSArray *names3; // <-- OK +- (void)setNames3:(__strong NSArray *)names; +@property (readwrite, strong) NSArray *names4; // <-- warning: Type of property.... +- (void)setNames4:(__strong NSArray *)names; + +@end + +@implementation MyClass2 +- (NSArray *)names1 { return _names1; } +- (void)setNames1:(NSArray *)names {} +- (NSArray *)names2 { return _names2; } +- (void)setNames2:(NSArray *)names {} +- (NSArray *)names3 { return _names3; } +- (void)setNames3:(__strong NSArray *)names {} +- (NSArray *)names4 { return _names4; } +- (void)setNames4:(__strong NSArray *)names {} + +@end + |
