diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 81ac43976271..20577618fe42 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-04  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* decl.c (complete_array_type): Don't gratuitously copy
+	maxindex. Its type is always set.
+
 2004-08-04  Paul Brook  <paul@codesourcery.com>
 
 	* Make-lang.in (cp/semantics.o, cp/optimize.o): Depend on TARGET_H.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 0f489976a637..10e0766b3d7b 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5272,7 +5272,6 @@ complete_array_type (tree type, tree initial_value, int do_default)
 	      else
 		maxindex = size_binop (PLUS_EXPR, maxindex, ssize_int (1));
 	    }
-	  maxindex = copy_node (maxindex);
 	}
       else
 	{
@@ -5303,8 +5302,6 @@ complete_array_type (tree type, tree initial_value, int do_default)
       domain = build_index_type (maxindex);
       TYPE_DOMAIN (type) = domain;
 
-      if (! TREE_TYPE (maxindex))
-	TREE_TYPE (maxindex) = domain;
       if (initial_value)
         itype = TREE_TYPE (initial_value);
       else