3 files changed, 10 insertions, 10 deletions

diff --git a/clang/include/clang/Basic/Diagnostic.td b/clang/include/clang/Basic/Diagnostic.td
index 2da2986c54e..74ca005e778 100644
--- a/clang/include/clang/Basic/Diagnostic.td
+++ b/clang/include/clang/Basic/Diagnostic.td
@@ -27,7 +27,7 @@ def CLASS_EXTENSION : DiagClass;
 def CLASS_ERROR     : DiagClass;
 
 // Diagnostic Groups.
-class DiagGroup<string name>;
+class DiagGroup<string Name> { string GroupName = Name; }
 class InGroup<DiagGroup Group> { DiagGroup Group = Group; }
 class IsGroup<string Name> { DiagGroup Group = DiagGroup<Name>; }
 
diff --git a/clang/include/clang/Basic/DiagnosticLexKinds.td b/clang/include/clang/Basic/DiagnosticLexKinds.td
index a9f849eccf3..0ae3b3f8b33 100644
--- a/clang/include/clang/Basic/DiagnosticLexKinds.td
+++ b/clang/include/clang/Basic/DiagnosticLexKinds.td
@@ -101,10 +101,10 @@ def pp_out_of_date_dependency : Warning<
 def pp_undef_builtin_macro : Warning<"undefining builtin macro">;
 def pp_redef_builtin_macro : Warning<"redefining builtin macro">;
 def pp_macro_not_used : Warning<"macro is not used">, DefaultIgnore,
-  IsGroup<"unused-macros">;
+  InGroup<DiagGroup<"unused-macros">>;
 def warn_pp_undef_identifier : Warning<
   "%0 is not defined, evaluates to 0">,
-  IsGroup<"undef">, DefaultIgnore;
+  InGroup<DiagGroup<"undef">>, DefaultIgnore;
 
 def pp_invalid_string_literal : Warning<
   "invalid string literal, ignoring final '\\'">;
@@ -122,7 +122,7 @@ def ext_pp_include_next_directive : Extension<
 def ext_pp_warning_directive : Extension<"#warning is a language extension">;
 
 def ext_pp_extra_tokens_at_eol : ExtWarn<
-  "extra tokens at end of #%0 directive">, IsGroup<"extra-tokens">;
+  "extra tokens at end of #%0 directive">, InGroup<DiagGroup<"extra-tokens">>;
   
 def ext_pp_comma_expr : Extension<"comma operator in operand of #if">;
 def ext_pp_bad_vaargs_use : Extension<
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index dbb5e375283..a77045e437f 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -228,7 +228,7 @@ def error_duplicate_ivar_use : Error<
 def error_property_implemented : Error<"property %0 is already implemented">;
 def warn_objc_property_attr_mutually_exclusive : Warning<
   "property attributes '%0' and '%1' are mutually exclusive">,
-  IsGroup<"readonly-setter-attrs">, DefaultIgnore;
+  InGroup<DiagGroup<"readonly-setter-attrs">>, DefaultIgnore;
 
 // C++ declarations
 def err_static_assert_expression_is_not_constant : Error<
@@ -726,13 +726,13 @@ def err_unexpected_namespace : Error<
 def err_undeclared_var_use : Error<"use of undeclared identifier %0">;
 def err_undeclared_use : Error<"use of undeclared '%0'">;
 def warn_deprecated : Warning<"%0 is deprecated">,
-    IsGroup<"deprecated-declarations">;
+    InGroup<DiagGroup<"deprecated-declarations">>;
 def warn_unavailable : Warning<"%0 is unavailable">;
 def note_unavailable_here : Note<
   "function has been explicitly marked %select{unavailable|deleted}0 here">;
 def warn_missing_prototype : Warning<
   "no previous prototype for function %0">,
-  IsGroup<"missing-prototypes">, DefaultIgnore;
+  InGroup<DiagGroup<"missing-prototypes">>, DefaultIgnore;
 def err_redefinition : Error<"redefinition of %0">;
 def err_static_non_static : Error<
   "static declaration of %0 follows non-static declaration">;
@@ -891,7 +891,7 @@ def ext_offsetof_extended_field_designator : Extension<
   "using extended field designator is an extension">;
 def warn_floatingpoint_eq : Warning<
   "comparing floating point with == or != is unsafe">,
-  IsGroup<"float-equal">, DefaultIgnore;
+  InGroup<DiagGroup<"float-equal">>, DefaultIgnore;
 
 def err_typecheck_subscript_value : Error<
   "subscripted value is neither array nor pointer">;
@@ -996,7 +996,7 @@ def err_value_init_for_array_type : Error<
   "array types cannot be value-initialized">;
 def warn_printf_not_string_constant : Warning<
   "format string is not a string literal (potentially insecure)">,
-  IsGroup<"format-nonliteral">;
+  InGroup<DiagGroup<"format-nonliteral">>;
 
 def err_unexpected_interface : Error<
   "unexpected interface name %0: expected expression">;
@@ -1168,7 +1168,7 @@ def ext_typecheck_convert_pointer_void_func : Extension<
   "%2 %1 converts between void* and function pointer, expected %0">;
 def ext_typecheck_convert_incompatible_pointer_sign : ExtWarn<
  "pointer types point to integer types with different sign %2 %1, expected %0">,
-  IsGroup<"pointer-sign">;
+  InGroup<DiagGroup<"pointer-sign">>;
 def ext_typecheck_convert_incompatible_pointer : ExtWarn<
   "incompatible pointer types %2 %1, expected %0">;
 def ext_typecheck_convert_discards_qualifiers : ExtWarn<