PR c++/80415 - wrong error with default arg and array reference.

	* tree.c (lvalue_kind): Return clk_class for an array prvalue.

From-SVN: r246954

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aa35f8347826a52109bc4f06ea26e83eccfa8746..c5db14c9dc123a8ee4263389918ed8bc448e2f34 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2017-04-17  Jason Merrill  <jason@redhat.com>
 
+       PR c++/80415 - wrong error with default arg and array reference.
+       * tree.c (lvalue_kind): Return clk_class for an array prvalue.
+
        * pt.c (tsubst_init): Set TARGET_EXPR_DIRECT_INIT_P.
 
 2017-04-15  Alexandre Oliva <aoliva@redhat.com>

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 57c1401a9d139753a2954bdf5804a7507cc113f6..67dfea2c65bba684cbb519167ec5e08524050369 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4677,7 +4677,7 @@ enum cp_lvalue_kind_flags {
   clk_none = 0,     /* Things that are not an lvalue.  */
   clk_ordinary = 1, /* An ordinary lvalue.  */
   clk_rvalueref = 2,/* An xvalue (rvalue formed using an rvalue reference) */
-  clk_class = 4,    /* A prvalue of class-type.  */
+  clk_class = 4,    /* A prvalue of class or array type.  */
   clk_bitfield = 8, /* An lvalue for a bit-field.  */
   clk_packed = 16   /* An lvalue for a packed field.  */
 };

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 2edd5671c08f5564d8d6ae4bdcb2b9b7e6c473c5..a1455c2b4b44d8706d6a70d6de4b9b6080a5883c 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -243,7 +243,8 @@ lvalue_kind (const_tree ref)
     default:
       if (!TREE_TYPE (ref))
        return clk_none;
-      if (CLASS_TYPE_P (TREE_TYPE (ref)))
+      if (CLASS_TYPE_P (TREE_TYPE (ref))
+         || TREE_CODE (TREE_TYPE (ref)) == ARRAY_TYPE)
        return clk_class;
       break;
     }

diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array5.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array5.C
new file mode 100644 (file)
index 0000000..12080a0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array5.C
@@ -0,0 +1,7 @@
+// PR c++/80415
+// { dg-do compile { target c++11 } }
+
+struct A {
+  A(int, int, const int (&)[1] = {});
+};
+A fn1() { return {0, 0}; }