From 9116d529f6d79990fc5b7315f9f905f9d2ec6fb7 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Tue, 6 Dec 2005 14:00:09 +0000 Subject: [PATCH] re PR c++/25263 (ICE on invalid array bound: int x[1/0];) PR c++/25263 * decl.c (compute_array_index_type): Check that itype is an INTEGER_CST node before testing/clearing TREE_OVERFLOW. * g++.dg/other/array2.C: New test case. From-SVN: r108119 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/other/array2.C | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/other/array2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 36642eb8280..82b99cb3b50 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2005-12-06 Roger Sayle + + PR c++/25263 + * decl.c (compute_array_index_type): Check that itype is an + INTEGER_CST node before testing/clearing TREE_OVERFLOW. + 2005-12-05 Daniel Berlin * ptree.c (cxx_print_decl): Update to check for decl_common diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index ca2e221d0f4..b5f89fccb06 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6374,7 +6374,8 @@ compute_array_index_type (tree name, tree size) /* Make sure that there was no overflow when creating to a signed index type. (For example, on a 32-bit machine, an array with size 2^32 - 1 is too big.) */ - else if (TREE_OVERFLOW (itype)) + else if (TREE_CODE (itype) == INTEGER_CST + && TREE_OVERFLOW (itype)) { error ("overflow in array dimension"); TREE_OVERFLOW (itype) = 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 490996b3c43..6c16c7d430b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-12-06 Roger Sayle + + PR c++/25263 + * g++.dg/other/array2.C: New test case. + 2005-12-05 Geoffrey Keating * gcc.dg/darwin-weakimport-3.c: New. diff --git a/gcc/testsuite/g++.dg/other/array2.C b/gcc/testsuite/g++.dg/other/array2.C new file mode 100644 index 00000000000..b091d96bec8 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/array2.C @@ -0,0 +1,6 @@ +// PR c++/25263 +// { dg-do compile } + +int x[1/0]; // { dg-warning "division by zero" } + // { dg-error "constant" "constant" { target *-*-* } 4 } +