diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-12-21 20:27:21 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-12-21 20:27:21 +0100 |
| commit | 9b8e85a5e3be803e0b476a8bbcb8aee0e9c48837 (patch) | |
| tree | 596ed8170302cc0de6ee4ac60a9c475bef9add5e /gcc | |
| parent | a4710e09ed089313e3d4189d00fcfc487262e05a (diff) | |
| download | gcc-9b8e85a5e3be803e0b476a8bbcb8aee0e9c48837.zip gcc-9b8e85a5e3be803e0b476a8bbcb8aee0e9c48837.tar.gz gcc-9b8e85a5e3be803e0b476a8bbcb8aee0e9c48837.tar.bz2 | |
re PR tree-optimization/83523 (ICE: verify_gimple failed (error: statement marked for throw, but doesn't))
PR tree-optimization/83523
* tree-ssa-math-opts.c (is_widening_mult_p): Return false if
for INTEGER_TYPE TYPE_OVERFLOW_TRAPS.
(convert_mult_to_fma): Likewise.
* g++.dg/tree-ssa/pr83523.C: New test.
From-SVN: r255953
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tree-ssa/pr83523.C | 25 | ||||
| -rw-r--r-- | gcc/tree-ssa-math-opts.c | 10 |
4 files changed, 40 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2b1aa73..4b886cc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2017-12-21 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/83523 + * tree-ssa-math-opts.c (is_widening_mult_p): Return false if + for INTEGER_TYPE TYPE_OVERFLOW_TRAPS. + (convert_mult_to_fma): Likewise. + PR tree-optimization/83521 * tree-ssa-phiopt.c (factor_out_conditional_conversion): Use gimple_build_assign without code on result of diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 566efde..088e8b0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2017-12-21 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/83523 + * g++.dg/tree-ssa/pr83523.C: New test. + PR tree-optimization/83521 * gcc.dg/pr83521.c: New test. diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr83523.C b/gcc/testsuite/g++.dg/tree-ssa/pr83523.C new file mode 100644 index 0000000..d9adf90 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr83523.C @@ -0,0 +1,25 @@ +// PR tree-optimization/83523 +// { dg-do compile } +// { dg-options "-O2 -fexceptions -fnon-call-exceptions -ftrapv" } + +#ifdef __SIZEOF_INT128__ +typedef __int128 T; +typedef long long int U; +#else +typedef long long int T; +typedef int U; +#endif + +struct S { S (); ~S (); }; +void bar (); + +T +foo (U x, U y) +{ + T z = x; + S s; + bar (); + z *= y; + bar (); + return z; +} diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c index 4e8f5e7..553a37c 100644 --- a/gcc/tree-ssa-math-opts.c +++ b/gcc/tree-ssa-math-opts.c @@ -2196,8 +2196,12 @@ is_widening_mult_p (gimple *stmt, { tree type = TREE_TYPE (gimple_assign_lhs (stmt)); - if (TREE_CODE (type) != INTEGER_TYPE - && TREE_CODE (type) != FIXED_POINT_TYPE) + if (TREE_CODE (type) == INTEGER_TYPE) + { + if (TYPE_OVERFLOW_TRAPS (type)) + return false; + } + else if (TREE_CODE (type) != FIXED_POINT_TYPE) return false; if (!is_widening_mult_rhs_p (type, gimple_assign_rhs1 (stmt), type1_out, @@ -2656,7 +2660,7 @@ convert_mult_to_fma (gimple *mul_stmt, tree op1, tree op2) /* We don't want to do bitfield reduction ops. */ if (INTEGRAL_TYPE_P (type) - && !type_has_mode_precision_p (type)) + && (!type_has_mode_precision_p (type) || TYPE_OVERFLOW_TRAPS (type))) return false; /* If the target doesn't support it, don't generate it. We assume that |