PR middle-end/45569
* tree-eh.c (operation_could_trap_helper_p): Neither COMPLEX_EXPR
nor CONSTRUCTOR can trap.
* tree-complex.c (update_complex_assignment): Update EH info.
* g++.dg/eh/pr45569.C: New testcase.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163947
138bc75d-0d04-0410-961f-
82ee72b054a4
2010-09-07 Richard Guenther <rguenther@suse.de>
PR middle-end/45569
+ * tree-eh.c (operation_could_trap_helper_p): Neither COMPLEX_EXPR
+ nor CONSTRUCTOR can trap.
+ * tree-complex.c (update_complex_assignment): Update EH info.
+
+2010-09-07 Richard Guenther <rguenther@suse.de>
+
+ PR middle-end/45569
* tree-cfg.c (build_gimple_cfg): Remove redundant stmt verification.
* passes.c (execute_function_todo): Do not verify anything if
we saw errors.
+2010-09-07 Richard Guenther <rguenther@suse.de>
+
+ PR middle-end/45569
+ * g++.dg/eh/pr45569.C: New testcase.
+
2010-09-07 Bernd Schmidt <bernds@codesourcery.com>
PR target/43137
--- /dev/null
+// { dg-do compile }
+// { dg-options "-O -fnon-call-exceptions" }
+
+float f ();
+_Complex float g ();
+
+void
+i (_Complex float);
+
+float j ()
+{
+ _Complex float x = 0;
+ try
+ {
+ x = f ();
+ }
+ catch ( ...)
+ {
+ x += g ();
+ }
+ i (x);
+}
+
update_complex_assignment (gimple_stmt_iterator *gsi, tree r, tree i)
{
gimple_stmt_iterator orig_si = *gsi;
+ gimple stmt;
if (gimple_in_ssa_p (cfun))
update_complex_components (gsi, gsi_stmt (*gsi), r, i);
gimple_assign_set_rhs_with_ops (&orig_si, COMPLEX_EXPR, r, i);
- update_stmt (gsi_stmt (orig_si));
+ stmt = gsi_stmt (orig_si);
+ update_stmt (stmt);
+ if (maybe_clean_eh_stmt (stmt))
+ gimple_purge_dead_eh_edges (gimple_bb (stmt));
}
return true;
return false;
+ case COMPLEX_EXPR:
+ case CONSTRUCTOR:
+ /* Constructing an object cannot trap. */
+ return false;
+
default:
/* Any floating arithmetic may trap. */
if (fp_operation && flag_trapping_math)