re PR fortran/83900 (ICE in gfc_simplify_matmul, at fortran/simplify.c:4593)

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.

From-SVN: r256914

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e90e38f9c1c255f40bfaf7f34688af5bd5f3d385..c68708cba7585813536d0aa3fc27b7f4b1c9fbb1 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 75fedc0f5988edef4db21249f63b8525197b3e02..340c080c311d48f3154f962d47d78aa1035fcd91 100644 (file)
--- 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 5373a3928f6bcd288b4ad45eeda8ae1e66700582..7d8a1daa28e11faf3b7c05cfe1331333cd4d0af7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/testsuite/gfortran.dg/matmul_17.f90 b/gcc/testsuite/gfortran.dg/matmul_17.f90
new file mode 100644 (file)
index 0000000..b21f02b
--- /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