From 340baef702ea62dfcdc8003ff9c4f4c2bd8322fb Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 29 Nov 2013 21:24:14 +0000 Subject: [PATCH] re PR c/42262 (internal compiler error: in set_designator, at c-typeck.c:5771) PR c/42262 c: * c-typeck.c (process_init_element): Do not treat a string as initializing a whole array when used with a designator for an individual element. testsuite: * gcc.dg/c99-init-5.c, gcc.dg/c99-init-6.c: New tests. From-SVN: r205543 --- gcc/c/ChangeLog | 7 +++++++ gcc/c/c-typeck.c | 2 ++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/c99-init-5.c | 9 +++++++++ gcc/testsuite/gcc.dg/c99-init-6.c | 6 ++++++ 5 files changed, 29 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/c99-init-5.c create mode 100644 gcc/testsuite/gcc.dg/c99-init-6.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 7016ecb4bf9..a106e64d094 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,10 @@ +2013-11-29 Joseph Myers + + PR c/42262 + * c-typeck.c (process_init_element): Do not treat a string as + initializing a whole array when used with a designator for an + individual element. + 2013-11-29 Joseph Myers PR c/57574 diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index f602ca4eb54..4d701045309 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -8504,6 +8504,7 @@ process_init_element (struct c_expr value, bool implicit, tree orig_value = value.value; int string_flag = orig_value != 0 && TREE_CODE (orig_value) == STRING_CST; bool strict_string = value.original_code == STRING_CST; + bool was_designated = designator_depth != 0; designator_depth = 0; designator_erroneous = 0; @@ -8512,6 +8513,7 @@ process_init_element (struct c_expr value, bool implicit, char x[] = {"foo"}; */ if (string_flag && constructor_type + && !was_designated && TREE_CODE (constructor_type) == ARRAY_TYPE && INTEGRAL_TYPE_P (TREE_TYPE (constructor_type)) && integer_zerop (constructor_unfilled_index)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3f13f64245c..f3f61027633 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-29 Joseph Myers + + PR c/42262 + * gcc.dg/c99-init-5.c, gcc.dg/c99-init-6.c: New tests. + 2013-11-29 H.J. Lu * lib/asan-dg.exp (asan_link_flags): Properly add path to diff --git a/gcc/testsuite/gcc.dg/c99-init-5.c b/gcc/testsuite/gcc.dg/c99-init-5.c new file mode 100644 index 00000000000..17bacd90c6a --- /dev/null +++ b/gcc/testsuite/gcc.dg/c99-init-5.c @@ -0,0 +1,9 @@ +/* Test for designated initializers: string constants used with + designator in character array should not initialize the array as a + whole. */ +/* { dg-do compile } */ +/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */ + +char g[] = { [7] = "abcd" }; /* { dg-error "initial" } */ +char h[10][10] = { [1][1] = "abcd" }; /* { dg-error "initial" } */ +char i[10][10] = { [1] = "abcd" }; diff --git a/gcc/testsuite/gcc.dg/c99-init-6.c b/gcc/testsuite/gcc.dg/c99-init-6.c new file mode 100644 index 00000000000..6328f82676f --- /dev/null +++ b/gcc/testsuite/gcc.dg/c99-init-6.c @@ -0,0 +1,6 @@ +/* Test for designated initializers: invalid uses of string constants + should not ICE. PR 42262. */ +/* { dg-do compile } */ +/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */ + +int a[] = { [0 ... 1] = "", [0] = "" }; /* { dg-error "initial" } */