From b5b5a59f185876899e94f29391331425c084347b Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Mon, 31 Jan 2011 23:20:03 +0000 Subject: [PATCH] Improve the diagnostic for -Wcustom-atomic-properties. Suggestion by Fariborz! llvm-svn: 124620 --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- clang/lib/Sema/SemaObjCProperty.cpp | 4 ++-- clang/test/SemaObjC/custom-atomic-property.m | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index fd2f69b549b9..76045af1a8c7 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/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, DefaultIgnore; def err_use_continuation_class : Error< diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index 2f5be4780650..b086ca751406 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/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/clang/test/SemaObjC/custom-atomic-property.m b/clang/test/SemaObjC/custom-atomic-property.m index cf3d473849f5..f80119e14903 100644 --- a/clang/test/SemaObjC/custom-atomic-property.m +++ b/clang/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