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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108119 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 36642eb..82b99cb 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-06  Roger Sayle  <roger@eyesopen.com>
+
+       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  <dberlin@dberlin.org>
 
        * ptree.c (cxx_print_decl): Update to check for decl_common

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index ca2e221..b5f89fc 100644 (file)
--- 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 490996b..6c16c7d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06  Roger Sayle  <roger@eyesopen.com>
+
+       PR c++/25263
+       * g++.dg/other/array2.C: New test case.
+
 2005-12-05  Geoffrey Keating  <geoffk@apple.com>
 
        * 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 (file)
index 0000000..b091d96
--- /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 }
+