Commit: 43a607ba1d6cd80eeb5dadade1ef5bebee614cf6 - gcc (git)

Commit MetaInfo

• Revisión: 43a607ba1d6cd80eeb5dadade1ef5bebee614cf6 (tree)
• Tiempo: 2019-03-25 21:15:59
• Autor: rguenth <rguenth@138b...>
• Commiter: rguenth

Log Message

2019-03-25 Richard Biener <[e-mail]>

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

Cambiar Resumen

• modified: gcc/ChangeLog
• modified: gcc/testsuite/ChangeLog
• add: gcc/testsuite/g++.dg/tree-ssa/pr89802.C
• modified: gcc/tree-ssa-math-opts.c

Diferencia incremental

--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
[phone]  Richard Biener  <[e-mail]>
+
+	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  <[e-mail]>
 
 	* config/s390/s390-builtin-types.def: Remove few unused types and

--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Richard Biener  <[e-mail]>
+
+	PR tree-optimization/89802
+	* g++.dg/tree-ssa/pr89802.C: New testcase.
+
 2019-03-25  Jakub Jelinek  <[e-mail]>
 
 	PR c++/60702

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

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