-Wformat should depend on format-extra-args so that -Wformat implies

the extra argument warnings, and -Wformat -Wno-format-extra-args
turns on -Wformat but not the extra-args warnings.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index 4aff9340f5..69651f41a4 100644
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -32,9 +32,10 @@ def : DiagGroup<"conversion">;
 def : DiagGroup<"declaration-after-statement">;
 def ExtraTokens : DiagGroup<"extra-tokens">;
 
-def Format : DiagGroup<"format">;
+def FormatExtraArgs : DiagGroup<"format-extra-args">;
+
+def Format : DiagGroup<"format", [FormatExtraArgs]>;
 def Format2 : DiagGroup<"format=2", [Format]>;
-def : DiagGroup<"format-extra-args", [Format]>;
 def FormatNonLiteral : DiagGroup<"format-nonliteral", [Format]>;
 def FormatSecurity : DiagGroup<"format-security", [Format]>;
 def : DiagGroup<"format-y2k", [Format]>;