diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2017-10-27 17:11:42 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2017-10-27 17:11:42 +0000 |
| commit | 6c6bde30706c29ffe41415f95ef3f48b6712cbe7 (patch) | |
| tree | 71e73a69c0cee745422b73c9d7ac3695e5d64c23 /gcc | |
| parent | a09ca93a71be0b9b3c2f8ff0181293a6036f0282 (diff) | |
| download | gcc-6c6bde30706c29ffe41415f95ef3f48b6712cbe7.zip gcc-6c6bde30706c29ffe41415f95ef3f48b6712cbe7.tar.gz gcc-6c6bde30706c29ffe41415f95ef3f48b6712cbe7.tar.bz2 | |
re PR fortran/56342 (MATMUL with PARAMETER: Simplification usually doesn't work)
2017-10-27 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/56342
* simplify.c (is_constant_array_expr): If the expression is
a parameter array, call gfc_simplify_expr.
2017-10-27 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/56342
* gfortran.dg/matmul_const.f90: New test.
From-SVN: r254157
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/matmul_const.f90 | 10 |
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9e34152..295704a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2017-10-27 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/56342 + * simplify.c (is_constant_array_expr): If the expression is + a parameter array, call gfc_simplify_expr. + 2017-10-25 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> * match.c (gfc_match_type_is): Fix typo in error message. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 169aef1..ba010a0 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -227,7 +227,8 @@ convert_boz (gfc_expr *x, int kind) } -/* Test that the expression is an constant array. */ +/* Test that the expression is an constant array, simplifying if + we are dealing with a parameter array. */ static bool is_constant_array_expr (gfc_expr *e) @@ -237,6 +238,10 @@ is_constant_array_expr (gfc_expr *e) if (e == NULL) return true; + if (e->expr_type == EXPR_VARIABLE && e->rank > 0 + && e->symtree->n.sym->attr.flavor == FL_PARAMETER) + gfc_simplify_expr (e, 1); + if (e->expr_type != EXPR_ARRAY || !gfc_is_constant_expr (e)) return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f841fca..2fb6daa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-27 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/56342 + * gfortran.dg/matmul_const.f90: New test. + 2017-10-25 Jan Hubicka <hubicka@ucw.cz> * gcc.target/i386/pr70021.c: Add -mtune=skylake. diff --git a/gcc/testsuite/gfortran.dg/matmul_const.f90 b/gcc/testsuite/gfortran.dg/matmul_const.f90 new file mode 100644 index 0000000..35dce32 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/matmul_const.f90 @@ -0,0 +1,10 @@ +! { dg-do run } +! { dg-additional-options "-fno-frontend-optimize -fdump-tree-original" } +program main + integer, parameter :: A(3,2) = reshape([1,2,3,4,5,6],[3,2]) + integer, parameter :: B(2,3) = reshape([1,1,1,1,1,1],[2,3]) + character (len=30) :: line + write (unit=line,fmt='(9i3)') matmul(A,B) + if (line /= ' 5 7 9 5 7 9 5 7 9') call abort +end program main +! dg-final { scan-tree-dump-times "matmul_i4" 0 "original" } } |