diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fb2b43dd98a..eb8d8ee5be0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-26  Fred Fish  <fnf@intrinsity.com>
+
+	PR c++/11895
+	* decl.c (reshape_init): Handle VECTOR_TYPE like ARRAY_TYPE,
+	except don't call array_type_nelts() with a VECTOR_TYPE.
+
 2004-01-16  Jan Hubicka  <jh@suse.cz>
 
 	* mangle.c (write_mangled_name): Remove inline modifier.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b95cf1e6171..db93277a592 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4330,14 +4330,14 @@ reshape_init (tree type, tree *initp)
 		}
 	    }
 	}
-      else if (TREE_CODE (type) == ARRAY_TYPE)
+      else if ((TREE_CODE (type) == ARRAY_TYPE)|| (TREE_CODE (type) == VECTOR_TYPE))
 	{
 	  tree index;
 	  tree max_index;
 
 	  /* If the bound of the array is known, take no more initializers
 	     than are allowed.  */
-	  max_index = (TYPE_DOMAIN (type) 
+	  max_index = ((TYPE_DOMAIN (type) && (TREE_CODE (type) == ARRAY_TYPE))
 		       ? array_type_nelts (type) : NULL_TREE);
 	  /* Loop through the array elements, gathering initializers.  */
 	  for (index = size_zero_node;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bb7015e6825..cae7d11ff68 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-16  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR c++/11895
+	* g++.dg/ext/vector1.C: New test.
+
 2004-01-16  Geoffrey Keating  <geoffk@apple.com>
 
 	* gcc.dg/pch/import-1.c: New.
diff --git a/gcc/testsuite/g++.dg/ext/vector1.C b/gcc/testsuite/g++.dg/ext/vector1.C
new file mode 100644
index 00000000000..c6f0e0409c5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/vector1.C
@@ -0,0 +1,5 @@
+//  PR c++/11895
+//  This used to ICE in reshape_init.
+//  testcase from fnf@ninemoons.com
+
+    __attribute__((vector_size(16))) int a1 = { 100, 200, 300, 400 };