From b53e05338485cebb06194831e75f46204707cdbb Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 3 Jan 2013 13:31:23 -0500
Subject: [PATCH] re PR c++/55856 (ICE on tuple with rvalue ref member)

	PR c++/55856
	* semantics.c (build_data_member_initialization): Handle DECL_EXPR.

From-SVN: r194865
---
 gcc/cp/ChangeLog                              |  3 +++
 gcc/cp/semantics.c                            |  8 ++++++--
 gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e349084e499..dda06fdb3d2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2013-01-03  Jason Merrill  <jason@redhat.com>
 
+	PR c++/55856
+	* semantics.c (build_data_member_initialization): Handle DECL_EXPR.
+
 	PR c++/53650
 	* call.c (type_has_extended_temps): New.
 	* cp-tree.h: Declare it.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index f6493993b37..9f8119f5069 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5848,15 +5848,19 @@ build_data_member_initialization (tree t, vec<constructor_elt, va_gc> **vec)
       member = TREE_OPERAND (t, 0);
       init = unshare_expr (TREE_OPERAND (t, 1));
     }
-  else
+  else if (TREE_CODE (t) == CALL_EXPR)
     {
-      gcc_assert (TREE_CODE (t) == CALL_EXPR);
       member = CALL_EXPR_ARG (t, 0);
       /* We don't use build_cplus_new here because it complains about
 	 abstract bases.  Leaving the call unwrapped means that it has the
 	 wrong type, but cxx_eval_constant_expression doesn't care.  */
       init = unshare_expr (t);
     }
+  else if (TREE_CODE (t) == DECL_EXPR)
+    /* Declaring a temporary, don't add it to the CONSTRUCTOR.  */
+    return true;
+  else
+    gcc_unreachable ();
   if (TREE_CODE (member) == INDIRECT_REF)
     member = TREE_OPERAND (member, 0);
   if (TREE_CODE (member) == NOP_EXPR)
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C
new file mode 100644
index 00000000000..4b526eaa794
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C
@@ -0,0 +1,16 @@
+// PR c++/55856
+// { dg-options -std=c++11 }
+
+struct A
+{
+  A(const char *);
+};
+
+template <class T>
+struct B
+{
+  T t;
+  template <class U> constexpr B(U&& u): t(u) { };
+};
+
+B<A&&> b("");
-- 
2.30.2