Wire up -Wformat=2 and -Wformat-extra-args

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70364 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index 69651f41a41883f0c9a8cecbfb5b6086372b121c..e0d33e2d2453e649b6c41ec1b4a3998d18e66c86 100644 (file)
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -35,14 +35,13 @@ def ExtraTokens : DiagGroup<"extra-tokens">;
 def FormatExtraArgs : DiagGroup<"format-extra-args">;
 
 def Format : DiagGroup<"format", [FormatExtraArgs]>;
-def Format2 : DiagGroup<"format=2", [Format]>;
 def FormatNonLiteral : DiagGroup<"format-nonliteral", [Format]>;
 def FormatSecurity : DiagGroup<"format-security", [Format]>;
-def : DiagGroup<"format-y2k", [Format]>;
+def FormatY2K : DiagGroup<"format-y2k", [Format]>;
+def Format2 : DiagGroup<"format=2",
+                        [FormatNonLiteral, FormatSecurity, FormatY2K]>;
 
 def FourByteMultiChar : DiagGroup<"four-char-constants">;
-
-
 def : DiagGroup<"init-self">;
 def : DiagGroup<"inline">;
 def : DiagGroup<"int-to-pointer-cast">;

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 88607f3a3ba890a90ce4a11ed63956ae1c42158f..30e9b389a617bba3477855ed59288b8a0a71fe22 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1509,7 +1509,7 @@ def warn_printf_write_back : Warning<
 def warn_printf_insufficient_data_args : Warning<
   "more '%%' conversions than data arguments">;
 def warn_printf_too_many_data_args : Warning<
-  "more data arguments than '%%' conversions">;
+  "more data arguments than '%%' conversions">, InGroup<FormatExtraArgs>;
 def warn_printf_invalid_conversion : Warning<"invalid conversion '%0'">;
 def warn_printf_missing_format_string : Warning<"format string missing">;
 def warn_printf_empty_format_string : Warning<"format string is empty">;