Bring over:

	* init.c (expand_aggr_init): Handle cv qualifiers on the object's
	type.

From-SVN: r10581

gcc/cp/ChangeLog

@@ -6,6 +6,11 @@ Mon Nov 20 14:05:00 1995  Mike Stump  <mrs@cygnus.com>
 
 	* g++.c (pfatal_with_name): Add missing third argument to concat.
 
+Thu Oct 26 13:59:54 1995  Mike Stump  <mrs@cygnus.com>
+
+	* init.c (expand_aggr_init): Handle cv qualifiers on the object's
+	type.
+
 Sun Nov 12 18:09:35 1995  Mike Stump  <mrs@cygnus.com>
 
 	* Version 2.7.1 released.

gcc/cp/init.c

@@ -1176,8 +1176,11 @@ expand_aggr_init (exp, init, alias_this, flags)
       && TREE_TYPE (init) == type)
     init = CONSTRUCTOR_ELTS (init);
 #endif
+
+  TREE_TYPE (exp) = TYPE_MAIN_VARIANT (type);
   expand_aggr_init_1 (TYPE_BINFO (type), exp, exp,
 		      init, alias_this, LOOKUP_NORMAL|flags);
+  TREE_TYPE (exp) = type;
   TREE_READONLY (exp) = was_const;
   TREE_THIS_VOLATILE (exp) = was_volatile;
 }