diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe319c1c497..f97de6c375c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-14  Roger Sayle  <roger@eyesopen.com>
+
+	* decl.c (grokdeclarator): Only check TREE_OVERFLOW on INTEGER_CST.
+
 2005-06-13  Geoffrey Keating  <geoffk@apple.com>
 
 	* Make-lang.in (c++.install-man): Doesn't really depend on installdirs.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index c17d6f8f372..d9de22d97c9 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7459,6 +7459,7 @@ grokdeclarator (const cp_declarator *declarator,
 
   if (TREE_CODE (type) == ARRAY_TYPE
       && COMPLETE_TYPE_P (type)
+      && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
       && TREE_OVERFLOW (TYPE_SIZE (type)))
     {
       error ("size of array %qs is too large", name);