diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-11-19 03:41:32 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-11-19 03:41:32 +0000 |
| commit | fe9d2c06094a0e4c59c75ea9b102f11999000676 (patch) | |
| tree | 01ca794a960e2fd3958c07bfa69e773a523c8a78 | |
| parent | 0ab5ba8c35c83389ec7e91bcdae0847f95738846 (diff) | |
| download | bcm5719-llvm-fe9d2c06094a0e4c59c75ea9b102f11999000676.tar.gz bcm5719-llvm-fe9d2c06094a0e4c59c75ea9b102f11999000676.zip | |
Rename an extension warning to ext_...
llvm-svn: 195095
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Misc/warning-flags.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 2c89d13865f..80b30127340 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -3775,7 +3775,7 @@ def warn_missing_field_initializers : Warning< InGroup<MissingFieldInitializers>, DefaultIgnore; def warn_braces_around_scalar_init : Warning< "braces around scalar initializer">; -def warn_many_braces_around_scalar_init : ExtWarn< +def ext_many_braces_around_scalar_init : ExtWarn< "too many braces around scalar initializer">; def ext_complex_component_init : Extension< "complex initialization specifying real and imaginary components " diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 72c37ebd13d..2728b26ef8d 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -1005,9 +1005,11 @@ void InitListChecker::CheckScalarType(const InitializedEntity &Entity, Expr *expr = IList->getInit(Index); if (InitListExpr *SubIList = dyn_cast<InitListExpr>(expr)) { + // FIXME: This is invalid, and accepting it causes overload resolution + // to pick the wrong overload in some corner cases. if (!VerifyOnly) SemaRef.Diag(SubIList->getLocStart(), - diag::warn_many_braces_around_scalar_init) + diag::ext_many_braces_around_scalar_init) << SubIList->getSourceRange(); CheckScalarType(Entity, SubIList, DeclType, Index, StructuredList, diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c index e61225ad20a..c48f5be5e59 100644 --- a/clang/test/Misc/warning-flags.c +++ b/clang/test/Misc/warning-flags.c @@ -23,6 +23,7 @@ CHECK-NEXT: ext_delete_void_ptr_operand CHECK-NEXT: ext_expected_semi_decl_list CHECK-NEXT: ext_explicit_specialization_storage_class CHECK-NEXT: ext_implicit_lib_function_decl +CHECK-NEXT: ext_many_braces_around_scalar_init CHECK-NEXT: ext_missing_declspec CHECK-NEXT: ext_missing_whitespace_after_macro_name CHECK-NEXT: ext_new_paren_array_nonconst @@ -87,7 +88,6 @@ CHECK-NEXT: warn_initializer_string_for_char_array_too_long CHECK-NEXT: warn_inline_namespace_reopened_noninline CHECK-NEXT: warn_integer_too_large_for_signed CHECK-NEXT: warn_invalid_asm_cast_lvalue -CHECK-NEXT: warn_many_braces_around_scalar_init CHECK-NEXT: warn_maynot_respond CHECK-NEXT: warn_method_param_redefinition CHECK-NEXT: warn_mismatched_exception_spec |
