diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-03-14 01:03:13 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-03-13 21:03:13 -0400 |
| commit | 024a6f45a72d4686aa535a37abe7b34d678e459d (patch) | |
| tree | 1435fb7d689bfd840cbef20af2eca339c8b440a7 /gcc | |
| parent | 17164de4f8d7409c65bcc9c060df824f49dc4629 (diff) | |
| download | gcc-024a6f45a72d4686aa535a37abe7b34d678e459d.zip gcc-024a6f45a72d4686aa535a37abe7b34d678e459d.tar.gz gcc-024a6f45a72d4686aa535a37abe7b34d678e459d.tar.bz2 | |
PR c++/82336 - link error with list-init default argument.
* decl.c (check_default_argument): Unshare an initializer list.
Co-Authored-By: Jason Merrill <jason@redhat.com>
From-SVN: r258512
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist-defarg2.C | 8 |
3 files changed, 17 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 09dc2b1..71fba75 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-03-13 Paolo Carlini <paolo.carlini@oracle.com> + Jason Merrill <jason@redhat.com> + + PR c++/82336 - link error with list-init default argument. + * decl.c (check_default_argument): Unshare an initializer list. + 2018-03-13 Jakub Jelinek <jakub@redhat.com> PR c++/84843 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index ff6dd66..45daccd 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -12668,7 +12668,9 @@ check_default_argument (tree decl, tree arg, tsubst_flags_t complain) A default argument expression is implicitly converted to the parameter type. */ ++cp_unevaluated_operand; - perform_implicit_conversion_flags (decl_type, arg, complain, + /* Avoid digest_init clobbering the initializer. */ + tree carg = BRACE_ENCLOSED_INITIALIZER_P (arg) ? unshare_expr (arg): arg; + perform_implicit_conversion_flags (decl_type, carg, complain, LOOKUP_IMPLICIT); --cp_unevaluated_operand; diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-defarg2.C b/gcc/testsuite/g++.dg/cpp0x/initlist-defarg2.C new file mode 100644 index 0000000..6524035 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist-defarg2.C @@ -0,0 +1,8 @@ +// PR c++/82336 +// { dg-do link { target c++11 } } + +struct foo { int x = 5; }; +struct bar : foo { bar() = default; }; +struct baz { bar x; }; +void qux(baz = {}){} +int main() { qux(); } |