diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 23 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 |
2 files changed, 14 insertions, 11 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 11e3241999b..700826fa658 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -7,8 +7,6 @@ // //===----------------------------------------------------------------------===// -def Trigraphs : DiagGroup<"trigraphs">; - def ImplicitFunctionDeclare : DiagGroup<"implicit-function-declaration">; def ImplicitInt : DiagGroup<"implicit-int">; @@ -37,13 +35,6 @@ def ExtraTokens : DiagGroup<"extra-tokens">; def FormatExtraArgs : DiagGroup<"format-extra-args">; def FormatZeroLength : DiagGroup<"format-zero-length">; -def Format : DiagGroup<"format", [FormatExtraArgs, FormatZeroLength]>; -def FormatSecurity : DiagGroup<"format-security", [Format]>; -def FormatNonLiteral : DiagGroup<"format-nonliteral", [FormatSecurity]>; -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">; @@ -56,7 +47,9 @@ def MultiChar : DiagGroup<"multichar">; def : DiagGroup<"nested-externs">; def : DiagGroup<"newline-eof">; def : DiagGroup<"long-long">; +def MismatchedTags : DiagGroup<"mismatched-tags">; def : DiagGroup<"missing-field-initializers">; +def NonNull : DiagGroup<"nonnull">; def : DiagGroup<"nonportable-cfstrings">; def : DiagGroup<"old-style-definition">; def : DiagGroup<"packed">; @@ -86,7 +79,7 @@ def InvalidOffsetof : DiagGroup<"invalid-offsetof">; def : DiagGroup<"strict-prototypes">; def : DiagGroup<"strict-selector-match">; def Switch : DiagGroup<"switch">; -def MismatchedTags : DiagGroup<"mismatched-tags">; +def Trigraphs : DiagGroup<"trigraphs">; def : DiagGroup<"type-limits">; def Uninitialized : DiagGroup<"uninitialized">; @@ -103,6 +96,16 @@ def : DiagGroup<"write-strings">; // Aggregation warning settings. + +// Format settings. +def Format : DiagGroup<"format", [FormatExtraArgs, FormatZeroLength, NonNull]>; +def FormatSecurity : DiagGroup<"format-security", [Format]>; +def FormatNonLiteral : DiagGroup<"format-nonliteral", [FormatSecurity]>; +def FormatY2K : DiagGroup<"format-y2k", [Format]>; +def Format2 : DiagGroup<"format=2", + [FormatNonLiteral, FormatSecurity, FormatY2K]>; + + def Extra : DiagGroup<"extra">; def Most : DiagGroup<"most", [ diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 49cadcd1a7c..2bbc3765e27 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1625,7 +1625,7 @@ def warn_printf_missing_format_string : Warning< "format string missing">, InGroup<Format>; def warn_null_arg : Warning< "argument is null where non-null is required">, - InGroup<DiagGroup<"nonnull">>, DefaultIgnore; + InGroup<NonNull>, DefaultIgnore; def warn_printf_empty_format_string : Warning< "format string is empty">, InGroup<FormatZeroLength>; def warn_printf_format_string_is_wide_literal : Warning< |
