re PR c++/47041 (Internal compiler error in build_data_member_initialization,…

re PR c++/47041 (Internal compiler error in build_data_member_initialization, add cp/semantics.c:5483)

	PR c++/47041
	* semantics.c (build_constexpr_constructor_member_initializers):
	Handle trivial copy.

From-SVN: r169108

gcc/cp/ChangeLog

+2011-01-21  Jason Merrill  <jason@redhat.com>
+
+	PR c++/47041
+	* semantics.c (build_constexpr_constructor_member_initializers):
+	Handle trivial copy.
+
 2011-01-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/47388

gcc/cp/semantics.c

@@ -5607,7 +5607,20 @@ build_constexpr_constructor_member_initializers (tree type, tree body)
     body = STATEMENT_LIST_HEAD (body)->stmt;
   body = BIND_EXPR_BODY (body);
   if (TREE_CODE (body) == CLEANUP_POINT_EXPR)
-    ok = build_data_member_initialization (body, &vec);
+    {
+      body = TREE_OPERAND (body, 0);
+      if (TREE_CODE (body) == EXPR_STMT)
+	body = TREE_OPERAND (body, 0);
+      if (TREE_CODE (body) == INIT_EXPR
+	  && (same_type_ignoring_top_level_qualifiers_p
+	      (TREE_TYPE (TREE_OPERAND (body, 0)),
+	       current_class_type)))
+	{
+	  /* Trivial copy.  */
+	  return TREE_OPERAND (body, 1);
+	}
+      ok = build_data_member_initialization (body, &vec);
+    }
   else if (TREE_CODE (body) == STATEMENT_LIST)
     {
       tree_stmt_iterator i;

gcc/testsuite/ChangeLog

+2011-01-21  Jason Merrill  <jason@redhat.com>
+
+	PR c++/47041
+	* g++.dg/cpp0x/constexpr-ctor6.C: New.
+
 2011-01-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/47388

gcc/testsuite/g++.dg/cpp0x/constexpr-ctor6.C

+// PR c++/47041
+// { dg-options "-std=c++0x -fno-elide-constructors" }
+
+struct S
+{
+  int i;
+};
+
+S s = S ();