diff options
| author | Jason Merrill <jason@redhat.com> | 2011-05-05 16:50:57 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-05 16:50:57 -0400 |
| commit | deb5046baa31e38ba18bf9bab2e0a5fa3cef6719 (patch) | |
| tree | 4c4f66836eb68f998569bb9974060b8fbfd2a0ac /gcc | |
| parent | 31e292c7a319a9a8bc449cf8514ed45951bb706e (diff) | |
| download | gcc-deb5046baa31e38ba18bf9bab2e0a5fa3cef6719.zip gcc-deb5046baa31e38ba18bf9bab2e0a5fa3cef6719.tar.gz gcc-deb5046baa31e38ba18bf9bab2e0a5fa3cef6719.tar.bz2 | |
re PR c++/40975 (ICE in copy_tree_r on array new)
PR c++/40975
* tree-inline.c (copy_tree_r): Use copy_statement_list.
(copy_statement_list): Don't recurse.
* stor-layout.c (copy_self_referential_tree_r): Don't allow
STATEMENT_LIST.
From-SVN: r173451
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/stor-layout.c | 3 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 18 |
3 files changed, 14 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9340930..297306e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-05-05 Jason Merrill <jason@redhat.com> + + PR c++/40975 + * tree-inline.c (copy_tree_r): Use copy_statement_list. + (copy_statement_list): Don't recurse. + * stor-layout.c (copy_self_referential_tree_r): Don't allow + STATEMENT_LIST. + 2011-05-05 Joseph Myers <joseph@codesourcery.com> * config/rs6000/rs6000.c (rs6000_handle_option): Don't fall diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 9ad0d0a..6d66237 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -177,6 +177,9 @@ copy_self_referential_tree_r (tree *tp, int *walk_subtrees, void *data) else if (code == SAVE_EXPR) return error_mark_node; + else if (code == STATEMENT_LIST) + gcc_unreachable (); + return copy_tree_r (tp, walk_subtrees, data); } diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 49488d4..46855a1 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -662,8 +662,6 @@ copy_statement_list (tree *tp) for (; !tsi_end_p (oi); tsi_next (&oi)) { tree stmt = tsi_stmt (oi); - if (TREE_CODE (stmt) == STATEMENT_LIST) - copy_statement_list (&stmt); tsi_link_after (&ni, stmt, TSI_CONTINUE_LINKING); } } @@ -4271,19 +4269,9 @@ copy_tree_r (tree *tp, int *walk_subtrees, void *data ATTRIBUTE_UNUSED) *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). */ - tree new_list = alloc_stmt_list (); - tree_stmt_iterator i = tsi_start (*tp); - tree_stmt_iterator j = tsi_last (new_list); - for (; !tsi_end_p (i); tsi_next (&i)) - { - tree stmt = tsi_stmt (i); - tsi_link_after (&j, stmt, TSI_CONTINUE_LINKING); - } - *tp = new_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) |