c++: Revert EXPR_LOCATION change to build_aggr_init_expr [PR96997]
authorPatrick Palka <ppalka@redhat.com>
Wed, 17 Feb 2021 01:49:12 +0000 (20:49 -0500)
committerPatrick Palka <ppalka@redhat.com>
Wed, 17 Feb 2021 01:49:12 +0000 (20:49 -0500)
commit78a6d0e30d7950216dc0c5be5d65d0cbed13924c
tree0593d5591041d2a22a516d0ffc97593241e80c45
parent0e804ce39a22ca660f48893f9541f6a4d8a17e56
c++: Revert EXPR_LOCATION change to build_aggr_init_expr [PR96997]

My change in r10-7718 to make build_aggr_init_expr set EXPR_LOCATION
(mimicking build_target_expr) causes the debuginfo regression PR96997.
Given that this change is mostly independent of the rest of the commit,
and that the only fallout of reverting it is a less accurate error
message location in a testcase introduced in the same commit, it seems
the best way forward is to just revert this part of the commit.

gcc/cp/ChangeLog:

PR debug/96997
PR c++/94034
* tree.c (build_aggr_init_expr): Revert r10-7718 change.

gcc/testsuite/ChangeLog:

PR debug/96997
PR c++/94034
* g++.dg/cpp1y/constexpr-nsdmi7b.C:  Adjust expected location of
"call to non-'constexpr' function" error message.
gcc/cp/tree.c
gcc/testsuite/g++.dg/cpp1y/constexpr-nsdmi7b.C