Improve on flexible array diagnostics (PR7029).

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

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index a76757fc078b93cdc8ea0381b2dbd1cfa5e50de7..2ce66903d27543f63defe9709d92b4f5abb35104 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1829,7 +1829,7 @@ def ext_variable_sized_type_in_struct : ExtWarn<
 def err_flexible_array_empty_struct : Error<
   "flexible array %0 not allowed in otherwise empty struct">;
 def err_flexible_array_has_nonpod_type : Error<
-  "flexible array %0 must have a non-dependent, non-POD type">;
+  "flexible array member %0 of non-POD element type %1">;
 def ext_flexible_array_in_struct : Extension<
   "%0 may not be nested in a struct due to flexible array member">;
 def ext_flexible_array_in_array : Extension<

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index dac070aaae804dcab8cb1ea4c8f6a1f8f4daf395..6fe91905dc5488fde06f81c484794f9487cc5ba7 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -6139,7 +6139,7 @@ void Sema::ActOnFields(Scope* S,
       if (!FD->getType()->isDependentType() &&
           !Context.getBaseElementType(FD->getType())->isPODType()) {
         Diag(FD->getLocation(), diag::err_flexible_array_has_nonpod_type)
-        << FD->getDeclName();
+          << FD->getDeclName() << FD->getType();
         FD->setInvalidDecl();
         EnclosingDecl->setInvalidDecl();
         continue;

diff --git a/test/SemaCXX/flexible-array-test.cpp b/test/SemaCXX/flexible-array-test.cpp
index e58992bc931435b61d4a922006427299dd984f0d..02e3f83974e2813d8bdd11774de54e8d3ab6c36c 100644 (file)
--- a/test/SemaCXX/flexible-array-test.cpp
+++ b/test/SemaCXX/flexible-array-test.cpp
@@ -41,5 +41,5 @@ struct S {
 
 struct X {
    int blah;
-   S strings[];        // expected-error {{flexible array 'strings' must have a non-dependent, non-POD type}}
+   S strings[];        // expected-error {{flexible array member 'strings' of non-POD element type 'S []'}}
 };