From da0c8d9793df1083a21628efdb6368174d2d78d4 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 5 Apr 2018 00:01:15 -0400
Subject: [PATCH] PR c++/85215 - ICE with copy-init from conversion.

	* call.c (merge_conversion_sequences): Fix type of direct binding
	sequence.

From-SVN: r259123
---
 gcc/cp/ChangeLog                    |  4 ++++
 gcc/cp/call.c                       |  6 ++++++
 gcc/testsuite/g++.dg/cpp1z/elide3.C | 15 +++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp1z/elide3.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 22f3e42f0cb..fd33f00f8d1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2018-04-04  Jason Merrill  <jason@redhat.com>
 
+	PR c++/85215 - ICE with copy-init from conversion.
+	* call.c (merge_conversion_sequences): Fix type of direct binding
+	sequence.
+
 	PR c++/84938 - ICE with division by ~-1.
 	* call.c (set_up_extended_ref_temp): Call cp_fully_fold.
 
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 7c99e8ad910..f2ada2768de 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3642,6 +3642,12 @@ merge_conversion_sequences (conversion *user_seq, conversion *std_seq)
 	(*t)->bad_p = true;
     }
 
+  if ((*t)->rvaluedness_matches_p)
+    /* We're binding a reference directly to the result of the conversion.
+       build_user_type_conversion_1 stripped the REFERENCE_TYPE from the return
+       type, but we want it back.  */
+    user_seq->type = TREE_TYPE (TREE_TYPE (user_seq->cand->fn));
+
   /* Replace the identity conversion with the user conversion
      sequence.  */
   *t = user_seq;
diff --git a/gcc/testsuite/g++.dg/cpp1z/elide3.C b/gcc/testsuite/g++.dg/cpp1z/elide3.C
new file mode 100644
index 00000000000..ca4d24708a8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/elide3.C
@@ -0,0 +1,15 @@
+// PR c++/85215
+// { dg-do compile { target c++11 } }
+
+template <typename _Tp> struct vector {
+  vector(vector &&) noexcept;
+};
+
+template <typename T> struct any_container {
+  operator vector<T> &&();
+};
+
+void f (any_container<int> c)
+{
+  vector<int> shape (c);
+}
-- 
2.30.2