Author: kremenek
Date: Sat Feb 9 01:13:16 2013
New Revision: 174802
URL: http://llvm.org/viewvc/llvm-project?rev=174802&view=rev
Log:
QoI: -Wreadonly-iboutlet-property should have the warning's location on the
property.
There's no need to refer to the @implementation at all.
Fixes <rdar://problem/13186515>
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/lib/Sema/SemaObjCProperty.cpp
cfe/trunk/test/SemaObjC/iboutlet.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=174802&r1=174801&r2=174802&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Sat Feb 9 01:13:16
2013
@@ -790,9 +790,9 @@ def warn_undeclared_selector : Warning<
def warn_implicit_atomic_property : Warning<
"property is assumed atomic by default">, InGroup<ImplicitAtomic>,
DefaultIgnore;
def note_auto_readonly_iboutlet_fixup_suggest : Note<
- "readonly IBOutlet property should be changed to be readwrite">;
+ "property should be changed to be readwrite">;
def warn_auto_readonly_iboutlet_property : Warning<
- "readonly IBOutlet property when auto-synthesized may "
+ "readonly IBOutlet property '%0' when auto-synthesized may "
"not work correctly with 'nib' loader">,
InGroup<DiagGroup<"readonly-iboutlet-property">>;
def warn_auto_implicit_atomic_property : Warning<
Modified: cfe/trunk/lib/Sema/SemaObjCProperty.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaObjCProperty.cpp?rev=174802&r1=174801&r2=174802&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaObjCProperty.cpp (original)
+++ cfe/trunk/lib/Sema/SemaObjCProperty.cpp Sat Feb 9 01:13:16 2013
@@ -861,8 +861,8 @@ Decl *Sema::ActOnPropertyImplDecl(Scope
}
if (!ReadWriteProperty) {
- Diag(IC->getLocation(), diag::warn_auto_readonly_iboutlet_property);
- Diag(property->getLocation(), diag::note_property_declare);
+ Diag(property->getLocation(),
diag::warn_auto_readonly_iboutlet_property)
+ << property->getName();
SourceLocation readonlyLoc;
if (LocPropertyAttribute(Context, "readonly",
property->getLParenLoc(), readonlyLoc)) {
Modified: cfe/trunk/test/SemaObjC/iboutlet.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/iboutlet.m?rev=174802&r1=174801&r2=174802&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/iboutlet.m (original)
+++ cfe/trunk/test/SemaObjC/iboutlet.m Sat Feb 9 01:13:16 2013
@@ -9,17 +9,15 @@
#define IBOutlet __attribute__((iboutlet))
@interface I
-@property (getter = MyGetter, readonly, assign) IBOutlet NSView *myView; //
expected-note {{property declared here}} \
- // expected-note
{{readonly IBOutlet property should be changed to be readwrite}}
+@property (getter = MyGetter, readonly, assign) IBOutlet NSView *myView; //
expected-warning {{readonly IBOutlet property 'myView' when auto-synthesized
may not work correctly with 'nib' loader}} expected-note {{property should be
changed to be readwrite}}
-@property (readonly) IBOutlet NSView *myView1; // expected-note {{readonly
IBOutlet property should be changed to be readwrite}} \
- // expected-note {{property
declared here}}
+@property (readonly) IBOutlet NSView *myView1; // expected-warning {{readonly
IBOutlet property 'myView1' when auto-synthesized may not work correctly with
'nib' loader}} expected-note {{property should be changed to be readwrite}}
-@property (getter = MyGetter, READONLY) IBOutlet NSView *myView2; //
expected-note {{property declared here}}
+@property (getter = MyGetter, READONLY) IBOutlet NSView *myView2; //
expected-warning {{readonly IBOutlet property 'myView2' when auto-synthesized
may not work correctly with 'nib' loader}}
@end
-@implementation I // expected-warning 3 {{readonly IBOutlet property when
auto-synthesized may not work correctly with 'nib' loader}}
+@implementation I
@end
@@ -29,7 +27,7 @@
@interface NSObject @end
@interface RKTFHView : NSObject
-@property( readonly ) __attribute__((iboutlet)) UILabel *autoReadOnlyReadOnly;
// expected-note {{property declared here}} expected-note {{readonly IBOutlet
property should be changed to be readwrite}}
+@property( readonly ) __attribute__((iboutlet)) UILabel *autoReadOnlyReadOnly;
// expected-warning {{readonly IBOutlet property 'autoReadOnlyReadOnly' when
auto-synthesized may not work correctly with 'nib' loader}} expected-note
{{property should be changed to be readwrite}}
@property( readonly ) __attribute__((iboutlet)) UILabel *autoReadOnlyReadWrite;
@property( readonly ) __attribute__((iboutlet)) UILabel
*synthReadOnlyReadWrite;
@end
@@ -39,6 +37,6 @@
@property( readwrite ) __attribute__((iboutlet)) UILabel
*synthReadOnlyReadWrite;
@end
-@implementation RKTFHView // expected-warning {{readonly IBOutlet property
when auto-synthesized may not work correctly with 'nib' loader}}
+@implementation RKTFHView
@synthesize synthReadOnlyReadWrite=_synthReadOnlyReadWrite;
@end
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
