Diagnostic fix ups

Author: delcypher

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -6724,19 +6724,16 @@ def err_counted_by_on_incomplete_type_on_assign : Error <
 
 def err_counted_by_on_incomplete_type_on_use : Error <
   "cannot %select{"
-    "use '%1'|" // Generic expr
-    "call '%1'" // CallExpr
-  "}0 with%select{"
-    "|"       // Generic expr
-    " return" // CallExpr
-  "}0 '%4' attributed type %2 because the pointee type %3 is incomplete">;
+    "use '%1' with '%4' attributed|" // Generic expr
+    "call '%1' with '%4' attributed return" // CallExpr
+  "}0 type %2 because the pointee type %3 is incomplete">;
 
 def note_counted_by_consider_completing_pointee_ty : Note<
   "consider providing a complete definition for %0">;
 
 def note_counted_by_consider_using_sized_by : Note<
   "consider using '__sized_by%select{|_or_null}0' instead of "
-  "__counted_by%select{|_or_null}0">;
+  "'__counted_by%select{|_or_null}0'">;
 
 def warn_counted_by_attr_elt_type_unknown_size :
   Warning<err_counted_by_attr_pointee_unknown_size.Summary>,

clang/test/Sema/attr-counted-by-or-null-struct-ptrs-completable-incomplete-pointee.c

@@ -21,8 +21,8 @@ typedef struct IncompleteTy Incomplete_t;
 
 struct CBBufDeclPos {
   int count;
-  struct IncompleteTy* buf __counted_by_or_null(count); // OK expected-note 27{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
-  Incomplete_t* buf_typedef __counted_by_or_null(count); // OK expected-note 27{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
+  struct IncompleteTy* buf __counted_by_or_null(count); // OK expected-note 27{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
+  Incomplete_t* buf_typedef __counted_by_or_null(count); // OK expected-note 27{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
 };
 
 void consume_struct_IncompleteTy(struct IncompleteTy* buf);
@@ -359,8 +359,8 @@ void consume_struct_IncompleteTy2(struct IncompleteTy2* buf);
 
 struct CBBufTyPos {
   int count;
-  struct IncompleteTy2* __counted_by_or_null(count) buf ; // OK expected-note 8{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
-  Incomplete_ty2 *__counted_by_or_null(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
+  struct IncompleteTy2* __counted_by_or_null(count) buf ; // OK expected-note 8{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
+  Incomplete_ty2 *__counted_by_or_null(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
 };
 
 void use_CBBufTyPos(struct CBBufTyPos* ptr) {
@@ -433,8 +433,8 @@ void consume_struct_IncompleteUnionTy(union IncompleteUnionTy* buf);
 
 struct CBBufUnionTyPos {
   int count;
-  union IncompleteUnionTy* __counted_by_or_null(count) buf ; // OK expected-note 8{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
-  IncompleteUnion_ty *__counted_by_or_null(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
+  union IncompleteUnionTy* __counted_by_or_null(count) buf ; // OK expected-note 8{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
+  IncompleteUnion_ty *__counted_by_or_null(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
 };
 
 void use_CBBufUnionTyPos(struct CBBufUnionTyPos* ptr) {
@@ -507,8 +507,8 @@ void consume_struct_IncompleteEnumTy(enum IncompleteEnumTy* buf);
 
 struct CBBufEnumTyPos {
   int count;
-  enum IncompleteEnumTy* __counted_by_or_null(count) buf ; // OK expected-note 8{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
-  IncompleteEnum_ty *__counted_by_or_null(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by_or_null' instead of __counted_by_or_null}}
+  enum IncompleteEnumTy* __counted_by_or_null(count) buf ; // OK expected-note 8{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
+  IncompleteEnum_ty *__counted_by_or_null(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by_or_null' instead of '__counted_by_or_null'}}
 };
 
 void use_CBBufEnumTyPos(struct CBBufEnumTyPos* ptr) {

clang/test/Sema/attr-counted-by-struct-ptrs-completable-incomplete-pointee.c

@@ -21,8 +21,8 @@ typedef struct IncompleteTy Incomplete_t;
 
 struct CBBufDeclPos {
   int count;
-  struct IncompleteTy* buf __counted_by(count); // OK expected-note 27{{consider using '__sized_by' instead of __counted_by}}
-  Incomplete_t* buf_typedef __counted_by(count); // OK expected-note 27{{consider using '__sized_by' instead of __counted_by}}
+  struct IncompleteTy* buf __counted_by(count); // OK expected-note 27{{consider using '__sized_by' instead of '__counted_by'}}
+  Incomplete_t* buf_typedef __counted_by(count); // OK expected-note 27{{consider using '__sized_by' instead of '__counted_by'}}
 };
 
 void consume_struct_IncompleteTy(struct IncompleteTy* buf);
@@ -359,8 +359,8 @@ void consume_struct_IncompleteTy2(struct IncompleteTy2* buf);
 
 struct CBBufTyPos {
   int count;
-  struct IncompleteTy2* __counted_by(count) buf ; // OK expected-note 8{{consider using '__sized_by' instead of __counted_by}}
-  Incomplete_ty2 *__counted_by(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by' instead of __counted_by}}
+  struct IncompleteTy2* __counted_by(count) buf ; // OK expected-note 8{{consider using '__sized_by' instead of '__counted_by'}}
+  Incomplete_ty2 *__counted_by(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by' instead of '__counted_by'}}
 };
 
 void use_CBBufTyPos(struct CBBufTyPos* ptr) {
@@ -433,8 +433,8 @@ void consume_struct_IncompleteUnionTy(union IncompleteUnionTy* buf);
 
 struct CBBufUnionTyPos {
   int count;
-  union IncompleteUnionTy* __counted_by(count) buf ; // OK expected-note 8{{consider using '__sized_by' instead of __counted_by}}
-  IncompleteUnion_ty *__counted_by(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by' instead of __counted_by}}
+  union IncompleteUnionTy* __counted_by(count) buf ; // OK expected-note 8{{consider using '__sized_by' instead of '__counted_by'}}
+  IncompleteUnion_ty *__counted_by(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by' instead of '__counted_by'}}
 };
 
 void use_CBBufUnionTyPos(struct CBBufUnionTyPos* ptr) {
@@ -507,8 +507,8 @@ void consume_struct_IncompleteEnumTy(enum IncompleteEnumTy* buf);
 
 struct CBBufEnumTyPos {
   int count;
-  enum IncompleteEnumTy* __counted_by(count) buf ; // OK expected-note 8{{consider using '__sized_by' instead of __counted_by}}
-  IncompleteEnum_ty *__counted_by(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by' instead of __counted_by}}
+  enum IncompleteEnumTy* __counted_by(count) buf ; // OK expected-note 8{{consider using '__sized_by' instead of '__counted_by'}}
+  IncompleteEnum_ty *__counted_by(count) buf_typedef; // OK expected-note 8{{consider using '__sized_by' instead of '__counted_by'}}
 };
 
 void use_CBBufEnumTyPos(struct CBBufEnumTyPos* ptr) {