From 3cbb0e1045436099c99c02f01b51850f74a48b3d Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 5 May 2011 17:02:51 -0400 Subject: [PATCH] re PR c++/40975 (ICE in copy_tree_r on array new) PR c++/40975 * tree-inline.c (copy_tree_r): Handle STATEMENT_LIST. From-SVN: r173454 --- gcc/ChangeLog | 5 +++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/init/new30.C | 15 +++++++++++++++ gcc/tree-inline.c | 6 ++++-- 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/init/new30.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2e432cf30b4d..fe0fc6a1146f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-05-05 Jason Merrill + + PR c++/40975 + * tree-inline.c (copy_tree_r): Handle STATEMENT_LIST. + 2011-05-05 Julian Brown * config/arm/neon.md (vec_set_internal): Fix misplaced diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c3edc6533a2a..a3db91f31bfc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-05-05 Jason Merrill + + * g++.dg/init/new30.C: New. + 2011-05-05 Julian Brown * gcc.target/arm/neon-vset_lanes8.c: New test. diff --git a/gcc/testsuite/g++.dg/init/new30.C b/gcc/testsuite/g++.dg/init/new30.C new file mode 100644 index 000000000000..24582d8fb1cb --- /dev/null +++ b/gcc/testsuite/g++.dg/init/new30.C @@ -0,0 +1,15 @@ +// PR c++/40975 + +struct data_type +{ + // constructor required to reproduce compiler bug + data_type() {} +}; + +struct ptr_type +{ + // array new as default argument required to reproduce compiler bug + ptr_type (data_type* ptr = new data_type[1]) { delete[] ptr; } +}; + +ptr_type obj; diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 29fef96f77f6..a581e5c8c76f 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3722,14 +3722,16 @@ copy_tree_r (tree *tp, int *walk_subtrees, void *data ATTRIBUTE_UNUSED) CONSTRUCTOR_ELTS (*tp)); *tp = new_tree; } + else if (code == STATEMENT_LIST) + /* We used to just abort on STATEMENT_LIST, but we can run into them + with statement-expressions (c++/40975). */ + copy_statement_list (tp); else if (TREE_CODE_CLASS (code) == tcc_type) *walk_subtrees = 0; else if (TREE_CODE_CLASS (code) == tcc_declaration) *walk_subtrees = 0; else if (TREE_CODE_CLASS (code) == tcc_constant) *walk_subtrees = 0; - else - gcc_assert (code != STATEMENT_LIST); return NULL_TREE; } -- 2.47.2