@@ -8479,13 +8479,15 @@ convert_for_initialization (tree exp, tree type, tree rhs, int flags,
|| (TREE_CODE (rhs) == TREE_LIST && TREE_VALUE (rhs) == error_mark_node))
return error_mark_node;
- if ((TREE_CODE (TREE_TYPE (rhs)) == ARRAY_TYPE
- && TREE_CODE (type) != ARRAY_TYPE
- && (TREE_CODE (type) != REFERENCE_TYPE
- || TREE_CODE (TREE_TYPE (type)) != ARRAY_TYPE))
- || (TREE_CODE (TREE_TYPE (rhs)) == FUNCTION_TYPE
- && !TYPE_REFFN_P (type))
- || TREE_CODE (TREE_TYPE (rhs)) == METHOD_TYPE)
+ if (MAYBE_CLASS_TYPE_P (type))
+ ;
+ else if ((TREE_CODE (TREE_TYPE (rhs)) == ARRAY_TYPE
+ && TREE_CODE (type) != ARRAY_TYPE
+ && (TREE_CODE (type) != REFERENCE_TYPE
+ || TREE_CODE (TREE_TYPE (type)) != ARRAY_TYPE))
+ || (TREE_CODE (TREE_TYPE (rhs)) == FUNCTION_TYPE
+ && !TYPE_REFFN_P (type))
+ || TREE_CODE (TREE_TYPE (rhs)) == METHOD_TYPE)
rhs = decay_conversion (rhs, complain);
rhstype = TREE_TYPE (rhs);
new file mode 100644
@@ -0,0 +1,8 @@
+// PR c++/16333
+
+struct X {
+ X (const int (&)[3]);
+};
+
+int a[3];
+X foo () { return a; }
new file mode 100644
@@ -0,0 +1,28 @@
+// PR c++/41426
+
+template <typename _T>
+struct A
+{
+ template <int _N>
+ A(_T (&V)[_N]);
+ A();
+};
+
+A<float> g1()
+{
+ float f[] = {1.1f, 2.3f};
+ return f;
+}
+
+struct B
+{
+ B (int (&v)[10]);
+ B();
+};
+
+B g2()
+{
+ int c[10];
+ return c;
+}
+
new file mode 100644
@@ -0,0 +1,19 @@
+struct Test {
+ template <int N>
+ Test(const char (&array)[N]) {}
+};
+
+Test test() {
+ return "test1";
+}
+
+void test2(Test arg = "test12") {}
+
+template <typename T>
+void test3(T arg = "test123") {}
+
+int main() {
+ test();
+ test2();
+ test3<Test>();
+}
new file mode 100644
@@ -0,0 +1,11 @@
+// { dg-do compile { target c++11 } }
+
+#include <cstddef>
+#include <initializer_list>
+
+struct S {
+ template<std::size_t N> S(char const (&)[N]);
+};
+struct T { S s; };
+void f(std::initializer_list<T>);
+void g() { f({{""}}); }