Now that reshape_init can return a non-CONSTRUCTOR, we need to call it
earlier in implicit_conversion.
Tested x86_64-pc-linux-gnu, applying to trunk.
commit 3732672177a2f4893d79279d44b5caed24d6177b
Author: Jason Merrill <ja...@redhat.com>
Date: Wed Jun 17 07:45:03 2015 -0400
PR c++/66515
* call.c (implicit_conversion): Call reshape_init here, early.
(build_aggr_conv): Not here.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 2f0c53a..1787576 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -871,9 +871,7 @@ build_aggr_conv (tree type, tree ctor, int flags, tsubst_flags_t complain)
tree field = next_initializable_field (TYPE_FIELDS (type));
tree empty_ctor = NULL_TREE;
- ctor = reshape_init (type, ctor, tf_none);
- if (ctor == error_mark_node)
- return NULL;
+ /* We already called reshape_init in implicit_conversion. */
/* The conversions within the init-list aren't affected by the enclosing
context; they're always simple copy-initialization. */
@@ -1762,6 +1760,17 @@ implicit_conversion (tree to, tree from, tree expr, bool c_cast_p,
to that conversion. */
complain &= ~tf_error;
+ /* Call reshape_init early to remove redundant braces. */
+ if (expr && BRACE_ENCLOSED_INITIALIZER_P (expr)
+ && COMPLETE_TYPE_P (complete_type (to))
+ && CP_AGGREGATE_TYPE_P (to))
+ {
+ expr = reshape_init (to, expr, complain);
+ if (expr == error_mark_node)
+ return NULL;
+ from = TREE_TYPE (expr);
+ }
+
if (TREE_CODE (to) == REFERENCE_TYPE)
conv = reference_binding (to, from, expr, c_cast_p, flags, complain);
else
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist96.C b/gcc/testsuite/g++.dg/cpp0x/initlist96.C
new file mode 100644
index 0000000..305565c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist96.C
@@ -0,0 +1,19 @@
+// PR c++/66515
+// { dg-do compile { target c++11 } }
+
+namespace std
+{
+ template <class _E> class initializer_list
+ {
+ const _E *_M_array;
+ unsigned long _M_len;
+ };
+}
+
+struct type_t { };
+
+type_t &
+get ()
+{
+ std::initializer_list<type_t>{ { get () } };
+}
