diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-01-31 23:20:03 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-01-31 23:20:03 +0000 |
| commit | 293a45e724a15fb58b8805a5791f9f3aee769cf6 (patch) | |
| tree | 79ce4a5d9d71ab73e6e75a53a2e581de6863119a | |
| parent | e4be87eb661ff12524074184f43b9d11d06ad376 (diff) | |
Improve the diagnostic for -Wcustom-atomic-properties. Suggestion by Fariborz!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124620 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaObjCProperty.cpp | 4 | ||||
| -rw-r--r-- | test/SemaObjC/custom-atomic-property.m | 14 |
3 files changed, 15 insertions, 5 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index fd2f69b549..76045af1a8 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -387,7 +387,7 @@ def warn_atomic_property_rule : Warning< "writable atomic property %0 cannot pair a synthesized setter/getter " "with a user defined setter/getter">; def warn_default_atomic_custom_getter_setter : Warning< - "atomic by default property %0 has a user defined setter/getter " + "atomic by default property %0 has a user defined %select{getter|setter}1 " "(property should be marked 'atomic' if this is intended)">, InGroup<CustomAtomic>, DefaultIgnore; def err_use_continuation_class : Error< diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp index 2f5be47806..b086ca7514 100644 --- a/lib/Sema/SemaObjCProperty.cpp +++ b/lib/Sema/SemaObjCProperty.cpp @@ -1096,13 +1096,13 @@ Sema::AtomicPropertySetterGetterRules (ObjCImplDecl* IMPDecl, if (GetterMethod) { Diag(GetterMethod->getLocation(), diag::warn_default_atomic_custom_getter_setter) - << Property->getIdentifier(); + << Property->getIdentifier() << 0; Diag(Property->getLocation(), diag::note_property_declare); } if (SetterMethod) { Diag(SetterMethod->getLocation(), diag::warn_default_atomic_custom_getter_setter) - << Property->getIdentifier(); + << Property->getIdentifier() << 1; Diag(Property->getLocation(), diag::note_property_declare); } } diff --git a/test/SemaObjC/custom-atomic-property.m b/test/SemaObjC/custom-atomic-property.m index cf3d473849..f80119e149 100644 --- a/test/SemaObjC/custom-atomic-property.m +++ b/test/SemaObjC/custom-atomic-property.m @@ -5,6 +5,16 @@ @end @implementation Foo - -(Foo*)myProp {return 0;} // expected-warning {{atomic by default property 'myProp' has a user defined setter/getter (property should be marked 'atomic' if this is intended)}} - -(void)setMyProp:(Foo*)e {} // expected-warning {{atomic by default property 'myProp' has a user defined setter/getter (property should be marked 'atomic' if this is intended)}} + -(Foo*)myProp {return 0;} // expected-warning {{atomic by default property 'myProp' has a user defined getter (property should be marked 'atomic' if this is intended)}} + -(void)setMyProp:(Foo*)e {} // expected-warning {{atomic by default property 'myProp' has a user defined setter (property should be marked 'atomic' if this is intended)}} +@end + +@interface Foo2 { + Foo *myProp; +} +@property (assign) Foo *myProp; +@end + +@implementation Foo2 +@synthesize myProp; // no warnings. @end |