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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@269913 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9e35e82025a224b53a2f67f1cb6083e786bd9332..e7fbaeba97f895b680408dead6e245733a573d67 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96b23c0403f0d2701e6411e2d966850765d914d0..ef7ae1b1c4c6e51d39a448f1a9a5c2579894460a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr89802.C b/gcc/testsuite/g++.dg/tree-ssa/pr89802.C
new file mode 100644 (file)
index 0000000..f93f8cd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr89802.C
@@ -0,0 +1,28 @@
+// { 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);
+}

diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index cb8a9143833a5c8c7ad2255678a5c8234cda5ce9..8902d85a7c94f5895c686912fb090b1cf57643de 100644 (file)
--- a/gcc/tree-ssa-math-opts.c
+++ b/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))
        {