init.c (perform_member_init): Always build_aggr_init for a class member with an…

init.c (perform_member_init): Always build_aggr_init for a class member with an explicit mem-initializer.

	* init.c (perform_member_init): Always build_aggr_init
	for a class member with an explicit mem-initializer.

From-SVN: r177477

gcc/cp/ChangeLog

 2011-08-05  Jason Merrill  <jason@redhat.com>
 
+	* init.c (perform_member_init): Always build_aggr_init
+	for a class member with an explicit mem-initializer.
+
 	* pt.c (unify) [TEMPLATE_TYPE_PARM]: Allow VLA for C++0x 'auto'.
 
 2011-08-04  Jakub Jelinek  <jakub@redhat.com>

gcc/cp/init.c

@@ -547,7 +547,8 @@ perform_member_init (tree member, tree init)
 	  finish_expr_stmt (init);
 	}
     }
-  else if (type_build_ctor_call (type))
+  else if (type_build_ctor_call (type)
+	   || (init && CLASS_TYPE_P (strip_array_types (type))))
     {
       if (TREE_CODE (type) == ARRAY_TYPE)
 	{