From 2bdf2565a0da36ae802f18a6d87c270619b1f52d Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Tue, 17 Apr 2018 04:25:18 +0000 Subject: [PATCH] Remove GC-related warning terminology ObjC-GC isn't used any more; clean up this warning text. rdar://problem/39049693 llvm-svn: 330174 --- clang/docs/DiagnosticsReference.rst | 2 +- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- clang/test/SemaObjC/property-10.m | 2 +- clang/test/SemaObjC/property.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/docs/DiagnosticsReference.rst b/clang/docs/DiagnosticsReference.rst index e2b0bd7..ddf0ec5 100644 --- a/clang/docs/DiagnosticsReference.rst +++ b/clang/docs/DiagnosticsReference.rst @@ -7556,7 +7556,7 @@ This diagnostic is enabled by default. **Diagnostic text:** +------------------------------------------------------------------------------------------------------------+ -|:warning:`warning:` |nbsp| :diagtext:`default property attribute 'assign' not appropriate for non-GC object`| +|:warning:`warning:` |nbsp| :diagtext:`default property attribute 'assign' not appropriate for object`| +------------------------------------------------------------------------------------------------------------+ +--------------------------------------------------------------------------------------------------------------------+ diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 0b859f8..081f981 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1032,7 +1032,7 @@ def warn_objc_pointer_masking : Warning< def warn_objc_pointer_masking_performSelector : Warning, InGroup; def warn_objc_property_default_assign_on_object : Warning< - "default property attribute 'assign' not appropriate for non-GC object">, + "default property attribute 'assign' not appropriate for object">, InGroup; def warn_property_attr_mismatch : Warning< "property attribute in class extension does not match the primary class">, diff --git a/clang/test/SemaObjC/property-10.m b/clang/test/SemaObjC/property-10.m index b2aaf2b..7bd0d3b 100644 --- a/clang/test/SemaObjC/property-10.m +++ b/clang/test/SemaObjC/property-10.m @@ -24,7 +24,7 @@ @property(unsafe_unretained, copy, retain) id p4_3; // expected-error {{property attributes 'unsafe_unretained' and 'copy' are mutually exclusive}}, expected-error {{property attributes 'unsafe_unretained' and 'retain' are mutually exclusive}} @property(unsafe_unretained, copy, strong) id s4_3; // expected-error {{property attributes 'unsafe_unretained' and 'copy' are mutually exclusive}}, expected-error {{property attributes 'unsafe_unretained' and 'strong' are mutually exclusive}} -@property id p4; // expected-warning {{no 'assign', 'retain', or 'copy' attribute is specified - 'assign' is assumed}}, expected-warning {{default property attribute 'assign' not appropriate for non-GC object}} +@property id p4; // expected-warning {{no 'assign', 'retain', or 'copy' attribute is specified - 'assign' is assumed}}, expected-warning {{default property attribute 'assign' not appropriate for object}} @property(nonatomic,copy) int (^includeMailboxCondition)(); @property(nonatomic,copy) int (*includeMailboxCondition2)(); // expected-error {{property with 'copy' attribute must be of object type}} diff --git a/clang/test/SemaObjC/property.m b/clang/test/SemaObjC/property.m index 7485447..b67ac37 100644 --- a/clang/test/SemaObjC/property.m +++ b/clang/test/SemaObjC/property.m @@ -6,7 +6,7 @@ int name; } @property int d1; -@property id prop_id; // expected-warning {{no 'assign', 'retain', or 'copy' attribute is specified - 'assign' is assumed}}, expected-warning {{default property attribute 'assign' not appropriate for non-GC object}} +@property id prop_id; // expected-warning {{no 'assign', 'retain', or 'copy' attribute is specified - 'assign' is assumed}}, expected-warning {{default property attribute 'assign' not appropriate for object}} @property int name; @end -- 2.7.4