diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0ad264f6798e..2501f5825c4e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-22  James E Wilson  <wilson@specifix.com>
+
+	PR tree-optimization/21105
+	* decl.c (grokdeclarator): Use TYPE_SIZE_UNIT not TYPE_SIZE for
+	array size check.
+
 2005-08-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c++/22233
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 9929eb6b2c24..4199b241b9b8 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7556,8 +7556,8 @@ 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)))
+      && TREE_CODE (TYPE_SIZE_UNIT (type)) == INTEGER_CST
+      && TREE_OVERFLOW (TYPE_SIZE_UNIT (type)))
     {
       error ("size of array %qs is too large", name);
       /* If we proceed with the array type as it is, we'll eventually