From ef9fc3ba34633a5efc1a123557ecda1691731466 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 11 Dec 2018 13:00:49 +0000 Subject: [PATCH] re PR middle-end/88448 (gnat.dg/opt66.adb etc. FAIL) 2018-12-11 Richard Biener 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 --- gcc/ChangeLog | 9 +++++++++ gcc/gimple.c | 2 +- gcc/tree-complex.c | 7 +++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9981ddd8359..a40b365be28 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-12-11 Richard Biener + + 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 PR target/37369 diff --git a/gcc/gimple.c b/gcc/gimple.c index 3222a219814..b3548f4f0fd 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 2e104c9defb..d360a4d4c81 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); -- 2.30.2