aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2021-04-03 16:17:29 -0400
committerJason Merrill <jason@redhat.com>2021-04-03 20:59:00 -0400
commitc3d3bb0f03dbd02512ab46979088ee8e22520c24 (patch)
tree3bc8b2dde7623eb9a72549c7df92c2fd27f51044
parentc0756c4eb36b6bf4bf1ea0cf3633f08ae0e1c13d (diff)
downloadgcc-c3d3bb0f03dbd02512ab46979088ee8e22520c24.zip
gcc-c3d3bb0f03dbd02512ab46979088ee8e22520c24.tar.gz
gcc-c3d3bb0f03dbd02512ab46979088ee8e22520c24.tar.bz2
c++: array new initialized from a call [PR99643]
Here the get_foo() call results in a TARGET_EXPR, which we strip in massage_init_elt, but then when build_vec_init tries to use it to initialize the array element we crash because build_aggr_init expects a class rvalue to have a TARGET_EXPR. So don't strip it. The stripping was added in r206639 for PR59659, so I checked that removing it didn't significantly increase compile time or memory usage for that testcase; compile time was unaffected, memory usage increased by 0.00004%. gcc/cp/ChangeLog: PR c++/99643 * typeck2.c (massage_init_elt): Don't strip TARGET_EXPR. gcc/testsuite/ChangeLog: PR c++/99643 * g++.dg/cpp0x/initlist-new5.C: New test.
-rw-r--r--gcc/cp/typeck2.c3
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/initlist-new5.C9
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index bde305b..a58d397 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1320,9 +1320,6 @@ massage_init_elt (tree type, tree init, int nested, int flags,
if (flags & LOOKUP_AGGREGATE_PAREN_INIT)
new_flags |= LOOKUP_AGGREGATE_PAREN_INIT;
init = digest_init_r (type, init, nested ? 2 : 1, new_flags, complain);
- /* Strip a simple TARGET_EXPR when we know this is an initializer. */
- if (SIMPLE_TARGET_EXPR_P (init))
- init = TARGET_EXPR_INITIAL (init);
/* When we defer constant folding within a statement, we may want to
defer this folding as well. */
tree t = fold_non_dependent_init (init, complain);
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-new5.C b/gcc/testsuite/g++.dg/cpp0x/initlist-new5.C
new file mode 100644
index 0000000..da54d89
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-new5.C
@@ -0,0 +1,9 @@
+// PR c++/99643
+// { dg-do compile { target c++11 } }
+
+struct Foo {};
+Foo get_foo();
+
+int main() {
+ new Foo[1]{get_foo()};
+}