diff options
| author | Jason Merrill <jason@redhat.com> | 2017-04-17 15:39:00 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-04-17 15:39:00 -0400 |
| commit | d478f1e4c947b2bdcd8e5cde8431f4c3dd79be60 (patch) | |
| tree | 83bc9d5afdf5d287e7d9bc25aed5f05b5f67adaf /gcc | |
| parent | 6864d849216e1a8ccc9d5e58b2b652ad28029a56 (diff) | |
| download | gcc-d478f1e4c947b2bdcd8e5cde8431f4c3dd79be60.zip gcc-d478f1e4c947b2bdcd8e5cde8431f4c3dd79be60.tar.gz gcc-d478f1e4c947b2bdcd8e5cde8431f4c3dd79be60.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist-array5.C | 7 |
4 files changed, 13 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aa35f83..c5db14c 100644 --- 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 57c1401..67dfea2 100644 --- 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 2edd567..a1455c2 100644 --- 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 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}; } |