diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2019-09-11 18:37:31 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2019-09-11 18:37:31 +0000 |
| commit | 22aa73bda49dc609c235b80b0e98d95ce8d50405 (patch) | |
| tree | f8455841487638861725e46a2f701e4ce790d495 /gcc | |
| parent | 84e33251331478d41b1c05768ccf0d060ce5b242 (diff) | |
| download | gcc-22aa73bda49dc609c235b80b0e98d95ce8d50405.zip gcc-22aa73bda49dc609c235b80b0e98d95ce8d50405.tar.gz gcc-22aa73bda49dc609c235b80b0e98d95ce8d50405.tar.bz2 | |
re PR fortran/91553 (ICE in gfc_real2complex, at fortran/arith.c:2208)
2019-09-11 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/91553
* simplify.c (gfc_convert_constant): During conversion check if the
constant is enclosed in parenthesis, and simplify expression.
2019-09-11 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/91553
* gfortran.dg/pr91553.f90: New test.
From-SVN: r275657
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr91553.f90 | 8 |
4 files changed, 25 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b3770ce..1702199 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2019-09-11 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/91553 + * simplify.c (gfc_convert_constant): During conversion check if the + constant is enclosed in parenthesis, and simplify expression. + +2019-09-11 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/91642 * io.c (gfc_match_inquire): null() cannot be in an iolength inquire list. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 7fc18d5..023eedb 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -8503,6 +8503,12 @@ gfc_convert_constant (gfc_expr *e, bt type, int kind) { if (c->expr->expr_type == EXPR_ARRAY) tmp = gfc_convert_constant (c->expr, type, kind); + else if (c->expr->expr_type == EXPR_OP + && c->expr->value.op.op == INTRINSIC_PARENTHESES) + { + gfc_simplify_expr (c->expr, 1); + tmp = f (c->expr, kind); + } else tmp = f (c->expr, kind); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6c316ee..546da4e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2019-09-11 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/91553 + * gfortran.dg/pr91553.f90: New test. + +2019-09-11 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/91642 * gfortran.dg/pr91642.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/pr91553.f90 b/gcc/testsuite/gfortran.dg/pr91553.f90 new file mode 100644 index 0000000..2d0b018 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr91553.f90 @@ -0,0 +1,8 @@ +! { dg-do run } +! Code contributed by Gerhard Steinmetz +program p + complex z(1) + z = (1.0, 2.0) * [real :: (3.0 + 4.0)] + if (real(z(1)) /= 7.) stop 1 + if (aimag(z(1)) /= 14.) stop 2 +end |