diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2019-09-14 17:05:17 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2019-09-14 17:05:17 +0000 |
| commit | 2060821300e8544de835c52eaa1e227d03484f24 (patch) | |
| tree | 971bf56ed9de24e205e2a1340dcf014e4fb0d90a | |
| parent | f6b886f7e0e04f01394bedc34de52a337d41b609 (diff) | |
2019-09-14 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-14 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/91553
* gfortran.dg/pr91553.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@275716 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 d07ad3025c7..19a3e0c6817 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2019-09-14 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-14 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/91566 * simplify.c (gfc_simplify_merge): Need to simplify expression after insertation of parenthesis. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 30924c1f049..f8c9a42cdc7 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -8526,6 +8526,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 38a599068e9..0df33c2333f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2019-09-14 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/91553 + * gfortran.dg/pr91553.f90: New test. + +2019-09-14 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/91566 * gfortran.dg/pr91566.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/pr91553.f90 b/gcc/testsuite/gfortran.dg/pr91553.f90 new file mode 100644 index 00000000000..2d0b018dded --- /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 |