re PR tree-optimization/89802 ([9 Regresssion] ICE: verify_gimple failed (error:…

re PR tree-optimization/89802 ([9 Regresssion] ICE: verify_gimple failed (error: dead STMT in EH table))

2019-03-25  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/89802
	* tree-ssa-math-opts.c (convert_mult_to_fma_1): Properly
	move EH data to folded stmt.

	* g++.dg/tree-ssa/pr89802.C: New testcase.

From-SVN: r269913

gcc/ChangeLog

+2019-03-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89802
+	* tree-ssa-math-opts.c (convert_mult_to_fma_1): Properly
+	move EH data to folded stmt.
+
 2019-03-25  Andreas Krebbel  <krebbel@linux.ibm.com>
 
 	* config/s390/s390-builtin-types.def: Remove few unused types and

gcc/testsuite/ChangeLog

+2019-03-25  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/89802
+	* g++.dg/tree-ssa/pr89802.C: New testcase.
+
 2019-03-25  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/60702

gcc/testsuite/g++.dg/tree-ssa/pr89802.C

+// { dg-do compile }
+// { dg-options "-O2 -fnon-call-exceptions" }
+// { dg-additional-options "-mfma" { target x86_64-*-* i?86-*-* } }
+
+struct ef
+{
+  ef (double xy) : m6 (xy)
+  {
+  }
+
+  ~ef ()
+    {
+    }
+
+  double m6;
+};
+
+ef
+operator- (ef &db, ef oa)
+{
+  return db.m6 - oa.m6;
+}
+
+ef
+vu (ef &db)
+{
+  return db - ef (db.m6 * 1.1);
+}

gcc/tree-ssa-math-opts.c

@@ -2917,8 +2917,13 @@ convert_mult_to_fma_1 (tree mul_result, tree op1, tree op2)
       gsi_replace (&gsi, fma_stmt, true);
       /* Follow all SSA edges so that we generate FMS, FNMA and FNMS
 	 regardless of where the negation occurs.  */
+      gimple *orig_stmt = gsi_stmt (gsi);
       if (fold_stmt (&gsi, follow_all_ssa_edges))
-	update_stmt (gsi_stmt (gsi));
+	{
+	  if (maybe_clean_or_replace_eh_stmt (orig_stmt, gsi_stmt (gsi)))
+	    gcc_unreachable ();
+	  update_stmt (gsi_stmt (gsi));
+	}
 
       if (dump_file && (dump_flags & TDF_DETAILS))
 	{