diff options
| author | Richard Biener <rguenther@suse.de> | 2018-12-11 13:00:49 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2018-12-11 13:00:49 +0000 |
| commit | ef9fc3ba34633a5efc1a123557ecda1691731466 (patch) | |
| tree | 5556483b9526f85a90de3dba1da3b04a9440bfd6 /gcc | |
| parent | 921a4c30579525b8de71d8118a2d31fcd68dea32 (diff) | |
| download | gcc-ef9fc3ba34633a5efc1a123557ecda1691731466.zip gcc-ef9fc3ba34633a5efc1a123557ecda1691731466.tar.gz gcc-ef9fc3ba34633a5efc1a123557ecda1691731466.tar.bz2 | |
re PR middle-end/88448 (gnat.dg/opt66.adb etc. FAIL)
2018-12-11 Richard Biener <rguenther@suse.de>
PR middle-end/88448
PR middle-end/88415
* gimple.c (gimple_assign_set_rhs_with_ops): Revert previous
change.
* tree-complex.c (update_complex_assignment): Properly transfer
or clean EH info around gimple_assign_set_rhs_with_ops.
From-SVN: r267021
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/gimple.c | 2 | ||||
| -rw-r--r-- | gcc/tree-complex.c | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9981ddd..a40b365 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-12-11 Richard Biener <rguenther@suse.de> + + PR middle-end/88448 + PR middle-end/88415 + * gimple.c (gimple_assign_set_rhs_with_ops): Revert previous + change. + * tree-complex.c (update_complex_assignment): Properly transfer + or clean EH info around gimple_assign_set_rhs_with_ops. + 2018-12-11 Richard Earnshaw <rearnsha@arm.com> PR target/37369 diff --git a/gcc/gimple.c b/gcc/gimple.c index 3222a21..b3548f4 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -1752,7 +1752,7 @@ gimple_assign_set_rhs_with_ops (gimple_stmt_iterator *gsi, enum tree_code code, if (new_rhs_ops > 2) gimple_assign_set_rhs3 (stmt, op3); if (stmt != old_stmt) - gsi_replace (gsi, stmt, true); + gsi_replace (gsi, stmt, false); } diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c index 2e104c9..d360a4d 100644 --- a/gcc/tree-complex.c +++ b/gcc/tree-complex.c @@ -698,12 +698,11 @@ update_complex_components_on_edge (edge e, tree lhs, tree r, tree i) static void update_complex_assignment (gimple_stmt_iterator *gsi, tree r, tree i) { - gimple *stmt; - + gimple *old_stmt = gsi_stmt (*gsi); gimple_assign_set_rhs_with_ops (gsi, COMPLEX_EXPR, r, i); - stmt = gsi_stmt (*gsi); + gimple *stmt = gsi_stmt (*gsi); update_stmt (stmt); - if (maybe_clean_eh_stmt (stmt)) + if (maybe_clean_or_replace_eh_stmt (old_stmt, stmt)) bitmap_set_bit (need_eh_cleanup, gimple_bb (stmt)->index); update_complex_components (gsi, gsi_stmt (*gsi), r, i); |