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

gcc/ChangeLog

+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

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);
 }
 
 

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);