diff options
| author | Richard Biener <rguenther@suse.de> | 2019-03-25 12:15:59 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2019-03-25 12:15:59 +0000 |
| commit | ecef0d345848dedec252f86f6d528c0536b30e69 (patch) | |
| tree | 8688a824bde76dd256138b7a58791e79f4507758 | |
| parent | 66ec77ce1910c0183fec5da0965813ecd56a778c (diff) | |
| download | gcc-ecef0d345848dedec252f86f6d528c0536b30e69.zip gcc-ecef0d345848dedec252f86f6d528c0536b30e69.tar.gz gcc-ecef0d345848dedec252f86f6d528c0536b30e69.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tree-ssa/pr89802.C | 28 | ||||
| -rw-r--r-- | gcc/tree-ssa-math-opts.c | 7 |
4 files changed, 45 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9e35e82..e7fbaeb 100644 --- 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 96b23c0..ef7ae1b 100644 --- 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 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 cb8a914..8902d85 100644 --- 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)) { |