aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2009-04-19 21:38:53 +0100
committerJoseph Myers <jsm28@gcc.gnu.org>2009-04-19 21:38:53 +0100
commita45e580b25016442fdc11d987e72e899d9225996 (patch)
tree4850118ecd76a196e8b3bf9540aac5af9f27f4bf /gcc
parent20845d35828c2d166550453b14b6e52c5f3b2826 (diff)
downloadgcc-a45e580b25016442fdc11d987e72e899d9225996.zip
gcc-a45e580b25016442fdc11d987e72e899d9225996.tar.gz
gcc-a45e580b25016442fdc11d987e72e899d9225996.tar.bz2
re PR c/37481 (-pedantic accepts flexible array member = "string" initialization)
PR c/37481 * c-typeck.c (digest_init): Check for initializing an array with a string literal. testsuite: * gcc.dg/c99-flex-array-7.c: New test. From-SVN: r146359
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-typeck.c4
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/c99-flex-array-7.c17
4 files changed, 32 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01488bf..6b45179 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2009-04-19 Joseph Myers <joseph@codesourcery.com>
+ PR c/37481
+ * c-typeck.c (digest_init): Check for initializing an array with a
+ string literal.
+
+2009-04-19 Joseph Myers <joseph@codesourcery.com>
+
PR c/19771
* c-semantics.c (pop_stmt_list): Propagate
STATEMENT_LIST_HAS_LABEL to parent statement list.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 821f4ce..96b1a5d 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -5254,6 +5254,10 @@ digest_init (tree type, tree init, bool null_pointer_constant,
expr.original_type = NULL;
maybe_warn_string_init (type, expr);
+ if (TYPE_DOMAIN (type) && !TYPE_MAX_VALUE (TYPE_DOMAIN (type)))
+ pedwarn_init (input_location, OPT_pedantic,
+ "initialization of a flexible array member");
+
if (comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)),
TYPE_MAIN_VARIANT (type)))
return inside_init;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a3e266b..9b66c9d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2009-04-19 Joseph Myers <joseph@codesourcery.com>
+ PR c/37481
+ * gcc.dg/c99-flex-array-7.c: New test.
+
+2009-04-19 Joseph Myers <joseph@codesourcery.com>
+
PR c/19771
* gcc.c-torture/execute/vla-dealloc-1.c: New test.
diff --git a/gcc/testsuite/gcc.dg/c99-flex-array-7.c b/gcc/testsuite/gcc.dg/c99-flex-array-7.c
new file mode 100644
index 0000000..8966e6c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c99-flex-array-7.c
@@ -0,0 +1,17 @@
+/* Initialization of a flexible array member with a string constant
+ must be diagnosed. PR 37481. */
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
+
+struct s { int a; char b[]; };
+
+struct s a = { 0, "" }; /* { dg-error "initialization of a flexible array member" } */
+/* { dg-error "near init" "near init" { target *-*-* } 8 } */
+struct s b = { 0, { 0 } }; /* { dg-error "initialization of a flexible array member" } */
+/* { dg-error "near init" "near init" { target *-*-* } 10 } */
+struct s c = { 0, { } }; /* { dg-error "ISO C forbids empty initializer braces" } */
+struct s d = { .b = "" }; /* { dg-error "initialization of a flexible array member" } */
+/* { dg-error "near init" "near init" { target *-*-* } 13 } */
+struct s e = { .b = { 0 } }; /* { dg-error "initialization of a flexible array member" } */
+/* { dg-error "near init" "near init" { target *-*-* } 15 } */
+struct s f = { .b = { } }; /* { dg-error "ISO C forbids empty initializer braces" } */