re PR c/71742 (Wrong formulation of "error: flexible array member in otherwise empty...

	PR c/71742
	* c-decl.c (finish_struct): Rephrase an error message.

	* gcc.dg/940510-1.c: Adjust dg-error.
	* gcc.dg/c99-flex-array-1.c: Likewise.
	* gcc.dg/c99-flex-array-typedef-1.c: Likewise.

From-SVN: r238883

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index d512a3da482766cc12615a7694e815dc58396805..89ca5aa81ec132e609b46f2ff44640b7697ed93d 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-29  Marek Polacek  <polacek@redhat.com>
+
+       PR c/71742
+       * c-decl.c (finish_struct): Rephrase an error message.
+
 2016-07-29  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/71969

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index f2773c5bb7287883e90681aad1b77412f6ab9073..9a922cc6f0645ab4c7621dea94b86da5bf12ab27 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -7880,7 +7880,8 @@ finish_struct (location_t loc, tree t, tree fieldlist, tree attributes,
          else if (!saw_named_field)
            {
              error_at (DECL_SOURCE_LOCATION (x),
-                       "flexible array member in otherwise empty struct");
+                       "flexible array member in a struct with no named "
+                       "members");
              TREE_TYPE (x) = error_mark_node;
            }
        }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4fd5e5b6ee29cd01e547e2d437b83683f95bbb43..e2388b1fddd567bc160998e3efea9a15bdb6513a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-07-29  Marek Polacek  <polacek@redhat.com>
+
+       PR c/71742
+       * gcc.dg/940510-1.c: Adjust dg-error.
+       * gcc.dg/c99-flex-array-1.c: Likewise.
+       * gcc.dg/c99-flex-array-typedef-1.c: Likewise.
+
 2016-07-29  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc.dg/pr59833.c: Use dg-add-options ieee.

diff --git a/gcc/testsuite/gcc.dg/940510-1.c b/gcc/testsuite/gcc.dg/940510-1.c
index 2c27e0090f9dca3eee3ba01de7184b842ab8e7b6..1f40d18ef67945898dadbf2b7fb3294eb81d7fd3 100644 (file)
--- a/gcc/testsuite/gcc.dg/940510-1.c
+++ b/gcc/testsuite/gcc.dg/940510-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-std=c89 -pedantic" } */
 struct { int a[]; } x = { 0 }; /* { dg-warning "ISO C90 does not support flexible array members" } */
-/* { dg-error "flexible array member in otherwise empty struct"  "" { target *-*-* }  3 } */
+/* { dg-error "flexible array member in a struct with no named members"  "" { target *-*-* }  3 } */
 

diff --git a/gcc/testsuite/gcc.dg/c99-flex-array-1.c b/gcc/testsuite/gcc.dg/c99-flex-array-1.c
index b14397ad295d675104f2d6b17ff64abbbd632c1f..f31570951778f9d8fd4b4b528e4374689be22489 100644 (file)
--- a/gcc/testsuite/gcc.dg/c99-flex-array-1.c
+++ b/gcc/testsuite/gcc.dg/c99-flex-array-1.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
 
-struct s1 { int x[]; }; /* { dg-error "empty struct" "empty" } */
-struct s2 { int :1; int x[]; }; /* { dg-error "empty struct" "empty" } */
+struct s1 { int x[]; }; /* { dg-error "no named members" "members" } */
+struct s2 { int :1; int x[]; }; /* { dg-error "no named members" "members" } */
 struct s3 { int x[]; int y; }; /* { dg-error "not at end" "not at end" } */
 struct s4 { int x; int y[]; };

diff --git a/gcc/testsuite/gcc.dg/c99-flex-array-typedef-1.c b/gcc/testsuite/gcc.dg/c99-flex-array-typedef-1.c
index 93f91f816a86e67eb4d67eaadb91b4c04f0ebf4c..8c3b71247420fb23251cf187276030c9a6779958 100644 (file)
--- a/gcc/testsuite/gcc.dg/c99-flex-array-typedef-1.c
+++ b/gcc/testsuite/gcc.dg/c99-flex-array-typedef-1.c
@@ -3,7 +3,7 @@
 /* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
 
 typedef int A[];
-struct s1 { A x; }; /* { dg-error "empty struct" "empty" } */
-struct s2 { int :1; A x; }; /* { dg-error "empty struct" "empty" } */
+struct s1 { A x; }; /* { dg-error "no named members" "members" } */
+struct s2 { int :1; A x; }; /* { dg-error "no named members" "members" } */
 struct s3 { A x; int y; }; /* { dg-error "not at end" "not at end" } */
 struct s4 { int x; A y; };