Rename "secondary initializer" -> "convenience initializer" in the warnings, which is a more correct and consistent term.

llvm-svn: 208142

2 files changed, 9 insertions, 9 deletions

diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index eadf4e747c3..c39accece2e 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2537,10 +2537,10 @@ def warn_objc_designated_init_non_designated_init_call : Warning<
   "designated initializer invoked a non-designated initializer">,
   InGroup<ObjCDesignatedInit>;
 def warn_objc_secondary_init_super_init_call : Warning<
-  "secondary initializer should not invoke an initializer on 'super'">,
+  "convenience initializer should not invoke an initializer on 'super'">,
   InGroup<ObjCDesignatedInit>;
 def warn_objc_secondary_init_missing_init_call : Warning<
-  "secondary initializer missing a 'self' call to another initializer">,
+  "convenience initializer missing a 'self' call to another initializer">,
   InGroup<ObjCDesignatedInit>;
 def warn_objc_implementation_missing_designated_init_override : Warning<
   "method override for the designated initializer of the superclass %objcinstance0 not found">,
diff --git a/clang/test/SemaObjC/attr-designated-init.m b/clang/test/SemaObjC/attr-designated-init.m
index b52e5c5d4a6..53506576940 100644
--- a/clang/test/SemaObjC/attr-designated-init.m
+++ b/clang/test/SemaObjC/attr-designated-init.m
@@ -29,7 +29,7 @@ __attribute__((objc_root_class))
 +(id)init { return 0; }
 -(id)init3 { return 0; }
 -(id)init4 NS_DESIGNATED_INITIALIZER { return 0; } // expected-error {{only applies to init methods of interface or class extension declarations}} \
-									 			   // expected-warning {{secondary initializer missing a 'self' call to another initializer}}
+									 			   // expected-warning {{convenience initializer missing a 'self' call to another initializer}}
 @end
 
 __attribute__((objc_root_class))
@@ -44,7 +44,7 @@ __attribute__((objc_root_class))
 
 @implementation B1
 -(id)initB1 { return 0; }
--(id)initB2 { return 0; } // expected-warning {{secondary initializer missing a 'self' call to another initializer}}
+-(id)initB2 { return 0; } // expected-warning {{convenience initializer missing a 'self' call to another initializer}}
 -(id)initB3 { return 0; }
 @end
 
@@ -156,8 +156,8 @@ __attribute__((objc_root_class))
 -(id)initS1 {
   return [super initB1];
 }
--(id)initS2 { // expected-warning {{secondary initializer missing a 'self' call to another initializer}}
-  return [super initB1]; // expected-warning {{secondary initializer should not invoke an initializer on 'super'}}
+-(id)initS2 { // expected-warning {{convenience initializer missing a 'self' call to another initializer}}
+  return [super initB1]; // expected-warning {{convenience initializer should not invoke an initializer on 'super'}}
 }
 -(id)initS3 {
   return [self initB1];
@@ -166,13 +166,13 @@ __attribute__((objc_root_class))
   return [self initS1];
 }
 -(id)initS5 {
-  [super initB1]; // expected-warning {{secondary initializer should not invoke an initializer on 'super'}}
+  [super initB1]; // expected-warning {{convenience initializer should not invoke an initializer on 'super'}}
   void (^blk)(void) = ^{
-    [super initB1]; // expected-warning {{secondary initializer should not invoke an initializer on 'super'}}
+    [super initB1]; // expected-warning {{convenience initializer should not invoke an initializer on 'super'}}
   };
   return [self initS1];
 }
--(id)initS6 { // expected-warning {{secondary initializer missing a 'self' call to another initializer}}
+-(id)initS6 { // expected-warning {{convenience initializer missing a 'self' call to another initializer}}
   S6 *s;
   return [s initS1];
 }