diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-20 07:00:43 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-20 07:00:43 +0000 |
| commit | aa499fa0254298c0f2a83fabe05fba5cd4f38098 (patch) | |
| tree | b7e17bf3849887aecab7e60a92b5d592d2c3a1b5 | |
| parent | 541ccdb7702d76ea6e92808c40e48db33e87e50c (diff) | |
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-7-branch@256913 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 48fb21240d73..08295d71b6b3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-01019 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 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index a9d8c7534b8e..22953059f3d7 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4202,7 +4202,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 b1e8ffddbff2..f2e78d8595a3 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 000000000000..b21f02be392c --- /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 |