Author: dexonsmith Date: Mon Apr 16 21:25:18 2018 New Revision: 330174 URL: http://llvm.org/viewvc/llvm-project?rev=330174&view=rev Log: Remove GC-related warning terminology
ObjC-GC isn't used any more; clean up this warning text. rdar://problem/39049693 Modified: cfe/trunk/docs/DiagnosticsReference.rst cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td cfe/trunk/test/SemaObjC/property-10.m cfe/trunk/test/SemaObjC/property.m Modified: cfe/trunk/docs/DiagnosticsReference.rst URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/DiagnosticsReference.rst?rev=330174&r1=330173&r2=330174&view=diff ============================================================================== --- cfe/trunk/docs/DiagnosticsReference.rst (original) +++ cfe/trunk/docs/DiagnosticsReference.rst Mon Apr 16 21:25:18 2018 @@ -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`| +------------------------------------------------------------------------------------------------------------+ +--------------------------------------------------------------------------------------------------------------------+ Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=330174&r1=330173&r2=330174&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Apr 16 21:25:18 2018 @@ -1032,7 +1032,7 @@ def warn_objc_pointer_masking : Warning< def warn_objc_pointer_masking_performSelector : Warning<warn_objc_pointer_masking.Text>, InGroup<ObjCPointerIntrospectPerformSelector>; 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<ObjCPropertyNoAttribute>; def warn_property_attr_mismatch : Warning< "property attribute in class extension does not match the primary class">, Modified: cfe/trunk/test/SemaObjC/property-10.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-10.m?rev=330174&r1=330173&r2=330174&view=diff ============================================================================== --- cfe/trunk/test/SemaObjC/property-10.m (original) +++ cfe/trunk/test/SemaObjC/property-10.m Mon Apr 16 21:25:18 2018 @@ -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}} Modified: cfe/trunk/test/SemaObjC/property.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property.m?rev=330174&r1=330173&r2=330174&view=diff ============================================================================== --- cfe/trunk/test/SemaObjC/property.m (original) +++ cfe/trunk/test/SemaObjC/property.m Mon Apr 16 21:25:18 2018 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits