diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-06-15 22:36:38 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-06-15 22:36:38 +0200 |
| commit | da8ea71e3733ba9c5f70a84cea9cafea6b0126b0 (patch) | |
| tree | c9666afbacc9e91f2ba218c44d66904e891c37cb /gcc | |
| parent | fe7a23a611df9954918f334f855935ce228c88d6 (diff) | |
| download | gcc-da8ea71e3733ba9c5f70a84cea9cafea6b0126b0.zip gcc-da8ea71e3733ba9c5f70a84cea9cafea6b0126b0.tar.gz gcc-da8ea71e3733ba9c5f70a84cea9cafea6b0126b0.tar.bz2 | |
re PR middle-end/85878 (ICE in convert_mode_scalar, at expr.c:287)
PR middle-end/85878
* expr.c (expand_assignment): Remove now redundant COMPLEX_MODE_P
check from first store_expr, use to_mode instead of GET_MODE (to_rtx).
Only call store_expr for halves if the mode is the same.
* gfortran.fortran-torture/compile/pr85878.f90: New test.
From-SVN: r261659
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/expr.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.fortran-torture/compile/pr85878.f90 | 8 |
4 files changed, 19 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9c7c574..d3f322d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2018-06-15 Jakub Jelinek <jakub@redhat.com> + PR middle-end/85878 + * expr.c (expand_assignment): Remove now redundant COMPLEX_MODE_P + check from first store_expr, use to_mode instead of GET_MODE (to_rtx). + Only call store_expr for halves if the mode is the same. + PR middle-end/86123 * match.pd ((X / Y) == 0 -> X < Y): Don't transform complex divisions. Fix up comment formatting. @@ -5150,12 +5150,12 @@ expand_assignment (tree to, tree from, bool nontemporal) gcc_checking_assert (COMPLEX_MODE_P (to_mode)); poly_int64 mode_bitsize = GET_MODE_BITSIZE (to_mode); unsigned short inner_bitsize = GET_MODE_UNIT_BITSIZE (to_mode); - if (TYPE_MODE (TREE_TYPE (from)) == GET_MODE (to_rtx) - && COMPLEX_MODE_P (GET_MODE (to_rtx)) + if (TYPE_MODE (TREE_TYPE (from)) == to_mode && known_eq (bitpos, 0) && known_eq (bitsize, mode_bitsize)) result = store_expr (from, to_rtx, false, nontemporal, reversep); - else if (known_eq (bitsize, inner_bitsize) + else if (TYPE_MODE (TREE_TYPE (from)) == GET_MODE_INNER (to_mode) + && known_eq (bitsize, inner_bitsize) && (known_eq (bitpos, 0) || known_eq (bitpos, inner_bitsize))) result = store_expr (from, XEXP (to_rtx, maybe_ne (bitpos, 0)), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 045c4cd..89b0567 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2018-06-15 Jakub Jelinek <jakub@redhat.com> + PR middle-end/85878 + * gfortran.fortran-torture/compile/pr85878.f90: New test. + PR middle-end/86123 * gcc.c-torture/compile/pr86123.c: New test. diff --git a/gcc/testsuite/gfortran.fortran-torture/compile/pr85878.f90 b/gcc/testsuite/gfortran.fortran-torture/compile/pr85878.f90 new file mode 100644 index 0000000..e52e95f --- /dev/null +++ b/gcc/testsuite/gfortran.fortran-torture/compile/pr85878.f90 @@ -0,0 +1,8 @@ +! PR middle-end/85878 + +program pr85878 + real :: a + complex :: c = (2.0, 3.0) + print *, c + print *, transfer (a, c) +end |