From: Jakub Jelinek Date: Tue, 5 Feb 2019 22:28:25 +0000 (+0100) Subject: re PR c++/89187 (ICE in initialize_argument_information, at calls.c:2023) X-Git-Tag: upstream/12.2.0~26361 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d397e3948ec945c8c3b4dc695e1b0b5820365a39;p=platform%2Fupstream%2Fgcc.git re PR c++/89187 (ICE in initialize_argument_information, at calls.c:2023) PR c++/89187 * optimize.c (maybe_thunk_body): Clear TREE_ADDRESSABLE on PARM_DECLs of the thunk. * lambda.c (maybe_add_lambda_conv_op): Likewise. * g++.dg/opt/pr89187.C: New test. From-SVN: r268564 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8ebbc12..660d746 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2019-02-05 Jakub Jelinek + + PR c++/89187 + * optimize.c (maybe_thunk_body): Clear TREE_ADDRESSABLE on + PARM_DECLs of the thunk. + * lambda.c (maybe_add_lambda_conv_op): Likewise. + 2019-02-05 Marek Polacek PR c++/89158 - by-value capture of constexpr variable broken. diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index c31b06e..2290fe0 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -1130,6 +1130,9 @@ maybe_add_lambda_conv_op (tree type) { tree new_node = copy_node (src); + /* Clear TREE_ADDRESSABLE on thunk arguments. */ + TREE_ADDRESSABLE (new_node) = 0; + if (!fn_args) fn_args = tgt = new_node; else diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c index 7b6edfc..aace7de 100644 --- a/gcc/cp/optimize.c +++ b/gcc/cp/optimize.c @@ -417,6 +417,8 @@ maybe_thunk_body (tree fn, bool force) gcc_assert (clone_parm); DECL_ABSTRACT_ORIGIN (clone_parm) = NULL; args[parmno] = clone_parm; + /* Clear TREE_ADDRESSABLE on thunk arguments. */ + TREE_ADDRESSABLE (clone_parm) = 0; clone_parm = TREE_CHAIN (clone_parm); } if (fn_parm_typelist) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6167416..ac70c72 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,9 @@ -2019-02-05 Andrea Corallo +2019-02-05 Jakub Jelinek + + PR c++/89187 + * g++.dg/opt/pr89187.C: New test. + +2019-02-05 Andrea Corallo * jit.dg/add-driver-options-testlib.c: Add support file for test-add-driver-options.c testcase. diff --git a/gcc/testsuite/g++.dg/opt/pr89187.C b/gcc/testsuite/g++.dg/opt/pr89187.C new file mode 100644 index 0000000..3e24a8f --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr89187.C @@ -0,0 +1,23 @@ +// PR c++/89187 +// { dg-do compile { target c++11 } } +// { dg-options "-Os -fno-tree-ccp -fno-tree-sra -fno-inline" } + +template struct A { + typedef T __attribute__((vector_size (N))) type; +}; +template using B = typename A::type; +template using C = B; +struct D { + D (C x) : d{x[3]} {} + D foo () { return d; } + C d; +}; +extern D d; +struct { D bar () { return d; } } l; +struct E { void baz () const; }; + +void +E::baz () const +{ + l.bar ().foo (); +}