From 7bfcb402eab7dbcf0108c5b9682a8b409fad4359 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 26 Sep 2007 13:32:27 +0100 Subject: [PATCH] re PR c/25309 (ICE on initialization of a huge array) PR c/25309 * c-common.c (complete_array_type): Diagnose too-large arrays and set type to error_mark_node. testsuite: * gcc.dg/large-size-array-2.c: Expect diagnostic for too-large array. * gcc.dg/large-size-array-4.c: New. Copy of large-size-array-2.c without -O2. From-SVN: r128811 --- gcc/ChangeLog | 6 ++++++ gcc/c-common.c | 10 ++++++++++ gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/large-size-array-2.c | 2 +- gcc/testsuite/gcc.dg/large-size-array-4.c | 7 +++++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/large-size-array-4.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f5fb4a62c08..a126c955f5b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-09-26 Joseph Myers + + PR c/25309 + * c-common.c (complete_array_type): Diagnose too-large arrays and + set type to error_mark_node. + 2007-09-26 Richard Guenther PR tree-optimization/30375 diff --git a/gcc/c-common.c b/gcc/c-common.c index 8ebc92007ca..bdb8d8009ed 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -7049,6 +7049,16 @@ complete_array_type (tree *ptype, tree initial_value, bool do_default) else type = c_build_qualified_type (main_type, quals); + if (COMPLETE_TYPE_P (type) + && TREE_CODE (TYPE_SIZE_UNIT (type)) == INTEGER_CST + && TREE_OVERFLOW (TYPE_SIZE_UNIT (type))) + { + error ("size of array is too large"); + /* If we proceed with the array type as it is, we'll eventually + crash in tree_low_cst(). */ + type = error_mark_node; + } + *ptype = type; return failure; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c43dad2773f..d2bb72533d9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2007-09-26 Joseph Myers + + PR c/25309 + * gcc.dg/large-size-array-2.c: Expect diagnostic for too-large + array. + * gcc.dg/large-size-array-4.c: New. Copy of large-size-array-2.c + without -O2. + 2007-09-26 Richard Guenther PR tree-optimization/30375 diff --git a/gcc/testsuite/gcc.dg/large-size-array-2.c b/gcc/testsuite/gcc.dg/large-size-array-2.c index 6ac31d11af4..5411b838fac 100644 --- a/gcc/testsuite/gcc.dg/large-size-array-2.c +++ b/gcc/testsuite/gcc.dg/large-size-array-2.c @@ -4,4 +4,4 @@ static char * name[] = { [0x80000000] = "bar" }; - +/* { dg-error "too large" "" { target { ! lp64 } } 6 } */ diff --git a/gcc/testsuite/gcc.dg/large-size-array-4.c b/gcc/testsuite/gcc.dg/large-size-array-4.c new file mode 100644 index 00000000000..020d57e2c64 --- /dev/null +++ b/gcc/testsuite/gcc.dg/large-size-array-4.c @@ -0,0 +1,7 @@ +/* PR c/25309 */ +/* { dg-do compile } */ +/* { dg-options "" } */ +static char * name[] = { + [0x80000000] = "bar" + }; +/* { dg-error "too large" "" { target { ! lp64 } } 6 } */ -- 2.30.2