diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-20 08:29:23 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-20 08:29:23 +0000 |
| commit | bd2787feead44725b9f09b432d0a6a4ccce34b17 (patch) | |
| tree | e8f24fc9b8c58bcf53dd0ed538f883794dddd94a | |
| parent | 92b4d854c927f13ff253dc3a1893e1e659a40548 (diff) | |
| download | gcc-bd2787feead44725b9f09b432d0a6a4ccce34b17.tar.gz | |
2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/83900
* simplify.c (gfc_simplify_matmul): Delete bogus assertion.
2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/83900
* gfortran.dg/matmul_17.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@256914 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/matmul_17.f90 | 9 |
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e90e38f9c1c..c68708cba75 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/83900 + * simplify.c (gfc_simplify_matmul): Delete bogus assertion. + +2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org> + Backport of r250734 from mainline PR fortran/80768 * check.c (gfc_check_num_images): Fix typo. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 75fedc0f598..340c080c311 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4017,7 +4017,6 @@ gfc_simplify_matmul (gfc_expr *matrix_a, gfc_expr *matrix_b) || !is_constant_array_expr (matrix_b)) return NULL; - gcc_assert (gfc_compare_types (&matrix_a->ts, &matrix_b->ts)); result = gfc_get_array_expr (matrix_a->ts.type, matrix_a->ts.kind, &matrix_a->where); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5373a3928f6..7d8a1daa28e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/83900 + * gfortran.dg/matmul_17.f90: New test. + +2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/80768 * gfortran.dg/num_images_1.f90: New test that tests fix in r250734. diff --git a/gcc/testsuite/gfortran.dg/matmul_17.f90 b/gcc/testsuite/gfortran.dg/matmul_17.f90 new file mode 100644 index 00000000000..b21f02be392 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/matmul_17.f90 @@ -0,0 +1,9 @@ +! { dg-do run } +! PR Fortran/83900 +! Contributed by Gerhard Steinmetz <gscfq t t-online dot de> +program p + integer, parameter :: a(3,2) = 1 + real, parameter :: b(2,3) = 2 + real, parameter :: c(3,3) = matmul(a, b) + if (any(c /= 4.)) call abort +end |