diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticLexKinds.td | 3 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 1 | ||||
| -rw-r--r-- | test/Misc/warning-flags.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index 031a54134e..f481a79294 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -43,7 +43,8 @@ def ext_no_newline_eof : Extension<"no newline at end of file">, def ext_dollar_in_identifier : Extension<"'$' in identifier">; def charize_microsoft_ext : Extension<"@# is a microsoft extension">; -def ext_token_used : Extension<"extension used">; +def ext_token_used : Extension<"extension used">, + InGroup<DiagGroup<"language-extension-token">>; def warn_unterminated_string : ExtWarn<"missing terminating '\"' character">; def warn_unterminated_char : ExtWarn<"missing terminating ' character">; diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 1dcb8bc91d..b9d471323d 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2637,6 +2637,7 @@ void darwin::CC1::RemoveCC1UnsupportedArgs(ArgStringList &CmdArgs) const { .Case("initializer-overrides", true) .Case("invalid-noreturn", true) .Case("invalid-token-paste", true) + .Case("language-extension-token", true) .Case("literal-conversion", true) .Case("literal-range", true) .Case("local-type-template-args", true) diff --git a/test/Misc/warning-flags.c b/test/Misc/warning-flags.c index c785546ebb..ae5d917939 100644 --- a/test/Misc/warning-flags.c +++ b/test/Misc/warning-flags.c @@ -17,7 +17,7 @@ This test serves two purposes: The list of warnings below should NEVER grow. It should gradually shrink to 0. -CHECK: Warnings without flags (301): +CHECK: Warnings without flags (300): CHECK-NEXT: backslash_newline_space CHECK-NEXT: charize_microsoft_ext CHECK-NEXT: ext_anon_param_requires_type_specifier @@ -85,7 +85,6 @@ CHECK-NEXT: ext_return_has_void_expr CHECK-NEXT: ext_subscript_non_lvalue CHECK-NEXT: ext_template_arg_extra_parens CHECK-NEXT: ext_thread_before -CHECK-NEXT: ext_token_used CHECK-NEXT: ext_top_level_semi CHECK-NEXT: ext_typecheck_addrof_void CHECK-NEXT: ext_typecheck_cast_nonscalar |