From: rguenth Date: Tue, 11 Dec 2018 13:00:49 +0000 (+0000) Subject: 2018-12-11 Richard Biener X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50583b9c141fd0ca89f1acb2e395bb685893b7bd;p=thirdparty%2Fgcc.git 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267021 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9981ddd83594..a40b365be283 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 3222a219814c..b3548f4f0fde 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 2e104c9defb3..d360a4d4c81f 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);