tree-optimization/109262 - ICE with non-call EH and forwprop

The recent combining of complex part loads to a complex load missed
to account for non-call EH.

	PR tree-optimization/109262
	* tree-ssa-forwprop.cc (pass_forwprop::execute): When
	combining a piecewise complex load avoid touching loads
	that throw internally.  Use fun, not cfun throughout.

	* g++.dg/torture/pr109262.C: New testcase.

diff --git a/gcc/testsuite/g++.dg/torture/pr109262.C b/gcc/testsuite/g++.dg/torture/pr109262.C
new file mode 100644 (file)
index 0000000..54323b9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr109262.C
@@ -0,0 +1,28 @@
+// { dg-do compile }
+// { dg-additional-options "-fnon-call-exceptions" }
+
+template < typename > struct au;
+template < typename b > au< b > operator*(au< b >, au< b > &p2) {
+  au< b > ax;
+  ax *= p2;
+  return p2;
+}
+template <> struct au< double > {
+  double p() { return __real__ az; }
+  double q() { return __imag__ az; }
+  void operator*=(au &o) {
+    _Complex bd = o.p();
+    __imag__ bd = o.q();
+    az *= bd;
+  }
+  _Complex az;
+};
+long bm, m;
+au< double > h;
+void bn() {
+  for (long k; ;) {
+    au< double > br;
+    for (long j = 0; 0 < bm; ++j)
+      au n = br * h;
+  }
+}

diff --git a/gcc/tree-ssa-forwprop.cc b/gcc/tree-ssa-forwprop.cc
index e34f08889542ad56ddd550fc0d9e8a1ac012a5a9..6df0b8f22151a433b89c40b9940bd9dd5669f1d8 100644 (file)
--- a/gcc/tree-ssa-forwprop.cc
+++ b/gcc/tree-ssa-forwprop.cc
@@ -3460,7 +3460,7 @@ pass_forwprop::execute (function *fun)
   lattice.create (num_ssa_names);
   lattice.quick_grow_cleared (num_ssa_names);
   int *postorder = XNEWVEC (int, n_basic_blocks_for_fn (fun));
-  int postorder_num = pre_and_rev_post_order_compute_fn (cfun, NULL,
+  int postorder_num = pre_and_rev_post_order_compute_fn (fun, NULL,
                                                         postorder, false);
   auto_vec<gimple *, 4> to_fixup;
   auto_vec<gimple *, 32> to_remove;
@@ -3594,7 +3594,7 @@ pass_forwprop::execute (function *fun)
                   && !gimple_has_volatile_ops (stmt)
                   && (TREE_CODE (gimple_assign_rhs1 (stmt))
                       != TARGET_MEM_REF)
-                  && !stmt_can_throw_internal (cfun, stmt))
+                  && !stmt_can_throw_internal (fun, stmt))
            {
              /* Rewrite loads used only in real/imagpart extractions to
                 component-wise loads.  */
@@ -3660,7 +3660,7 @@ pass_forwprop::execute (function *fun)
                       || (fun->curr_properties & PROP_gimple_lvec))
                   && gimple_assign_load_p (stmt)
                   && !gimple_has_volatile_ops (stmt)
-                  && !stmt_can_throw_internal (cfun, stmt)
+                  && !stmt_can_throw_internal (fun, stmt)
                   && (!VAR_P (rhs) || !DECL_HARD_REGISTER (rhs)))
            optimize_vector_load (&gsi);
 
@@ -3688,7 +3688,7 @@ pass_forwprop::execute (function *fun)
                  location_t loc = gimple_location (use_stmt);
                  gimple_set_location (new_stmt, loc);
                  gimple_set_vuse (new_stmt, gimple_vuse (use_stmt));
-                 gimple_set_vdef (new_stmt, make_ssa_name (gimple_vop (cfun)));
+                 gimple_set_vdef (new_stmt, make_ssa_name (gimple_vop (fun)));
                  SSA_NAME_DEF_STMT (gimple_vdef (new_stmt)) = new_stmt;
                  gimple_set_vuse (use_stmt, gimple_vdef (new_stmt));
                  gimple_stmt_iterator gsi2 = gsi_for_stmt (use_stmt);
@@ -3718,6 +3718,8 @@ pass_forwprop::execute (function *fun)
                       && (gimple_vuse (def1) == gimple_vuse (def2))
                       && !gimple_has_volatile_ops (def1)
                       && !gimple_has_volatile_ops (def2)
+                      && !stmt_can_throw_internal (fun, def1)
+                      && !stmt_can_throw_internal (fun, def2)
                       && gimple_assign_rhs_code (def1) == REALPART_EXPR
                       && gimple_assign_rhs_code (def2) == IMAGPART_EXPR
                       && operand_equal_p (TREE_OPERAND (gimple_assign_rhs1
@@ -3752,7 +3754,7 @@ pass_forwprop::execute (function *fun)
              if (single_imm_use (lhs, &use_p, &use_stmt)
                  && gimple_store_p (use_stmt)
                  && !gimple_has_volatile_ops (use_stmt)
-                 && !stmt_can_throw_internal (cfun, use_stmt)
+                 && !stmt_can_throw_internal (fun, use_stmt)
                  && is_gimple_assign (use_stmt)
                  && (TREE_CODE (gimple_assign_lhs (use_stmt))
                      != TARGET_MEM_REF))
@@ -3783,7 +3785,7 @@ pass_forwprop::execute (function *fun)
                      gimple_set_location (new_stmt, loc);
                      gimple_set_vuse (new_stmt, gimple_vuse (use_stmt));
                      gimple_set_vdef (new_stmt,
-                                      make_ssa_name (gimple_vop (cfun)));
+                                      make_ssa_name (gimple_vop (fun)));
                      SSA_NAME_DEF_STMT (gimple_vdef (new_stmt)) = new_stmt;
                      gimple_set_vuse (use_stmt, gimple_vdef (new_stmt));
                      gimple_stmt_iterator gsi2 = gsi_for_stmt (use_stmt);
@@ -4042,8 +4044,8 @@ pass_forwprop::execute (function *fun)
   BITMAP_FREE (to_purge);
   BITMAP_FREE (need_ab_cleanup);
 
-  if (get_range_query (cfun) != get_global_range_query ())
-    disable_ranger (cfun);
+  if (get_range_query (fun) != get_global_range_query ())
+    disable_ranger (fun);
 
   if (cfg_changed)
     todoflags |= TODO_cleanup_cfg;