From a3614b503c535792bd0cd0a00d36b1cdd8299edd Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 22 Feb 2004 20:04:51 +0100 Subject: [PATCH] decl.c (reshape_init): Convert array designator to sizetype. * decl.c (reshape_init): Convert array designator to sizetype. * g++.dg/parse/init1.C: New test. From-SVN: r78273 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 2 +- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/parse/init1.C | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/parse/init1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6420993903c4..9d6b96913cf2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2004-02-22 Jakub Jelinek + + * decl.c (reshape_init): Convert array designator to sizetype. + 2004-02-22 Gabriel Dos Reis Backport from mainline diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index b558f0945358..942c6a4c419d 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8395,7 +8395,7 @@ reshape_init (tree type, tree *initp) TREE_CHAIN (element_init) = CONSTRUCTOR_ELTS (new_init); CONSTRUCTOR_ELTS (new_init) = element_init; if (TREE_PURPOSE (element_init)) - index = TREE_PURPOSE (element_init); + index = convert (sizetype, TREE_PURPOSE (element_init)); } } else diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d2252d6ee0bd..199c8f52bf9f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-02-22 Jakub Jelinek + + * g++.dg/parse/init1.C: New test. + 2004-02-22 Hans-Peter Nilsson PR target/14209 diff --git a/gcc/testsuite/g++.dg/parse/init1.C b/gcc/testsuite/g++.dg/parse/init1.C new file mode 100644 index 000000000000..7e7011594ba3 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/init1.C @@ -0,0 +1,2 @@ +// { dg-do compile } +int i[8] = { [0] 3 }; -- 2.47.2