From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Sat, 20 Jan 2018 08:29:23 +0000 (+0000)
Subject: re PR fortran/83900 (ICE in gfc_simplify_matmul, at fortran/simplify.c:4593)
X-Git-Tag: releases/gcc-6.5.0~573
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e034ea3eb9db4b6695e789cd91b664ca47662fc;p=thirdparty%2Fgcc.git

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 e90e38f9c1c2..c68708cba758 100644
--- 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 75fedc0f5988..340c080c311d 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 5373a3928f6b..7d8a1daa28e1 100644
--- 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
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