From a45e580b25016442fdc11d987e72e899d9225996 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 19 Apr 2009 21:38:53 +0100 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/c-typeck.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/c99-flex-array-7.c | 17 +++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/c99-flex-array-7.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01488bf8bf9..6b451797740 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-04-19 Joseph Myers + + PR c/37481 + * c-typeck.c (digest_init): Check for initializing an array with a + string literal. + 2009-04-19 Joseph Myers PR c/19771 diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 821f4ce13a6..96b1a5da599 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 a3e266be90a..9b66c9dd950 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-04-19 Joseph Myers + + PR c/37481 + * gcc.dg/c99-flex-array-7.c: New test. + 2009-04-19 Joseph Myers PR c/19771 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 00000000000..8966e6cccc0 --- /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" } */