PR libfortran/26985

	* m4/matmul.m4: Correct the condition for the memset call,
	and remove the unneeded call to size0.
	* generated/matmul_r4.c: Regenerate.
	* generated/matmul_r8.c: Regenerate.
	* generated/matmul_r10.c: Regenerate.
	* generated/matmul_r16.c: Regenerate.
	* generated/matmul_c4.c: Regenerate.
	* generated/matmul_c8.c: Regenerate.
	* generated/matmul_c10.c: Regenerate.
	* generated/matmul_c16.c: Regenerate.
	* generated/matmul_i4.c: Regenerate.
	* generated/matmul_i8.c: Regenerate.
	* generated/matmul_i16.c: Regenerate.

	* gfortran.dg/matmul_2.f90: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113552 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 22 insertions, 22 deletions

diff --git a/libgfortran/generated/matmul_c10.c b/libgfortran/generated/matmul_c10.c
index edbd1e6becc..93032f81404 100644
--- a/libgfortran/generated/matmul_c10.c
+++ b/libgfortran/generated/matmul_c10.c
@@ -193,8 +193,8 @@ matmul_c10 (gfc_array_c10 * const restrict retarray,
       const GFC_COMPLEX_10 * restrict abase_n;
       GFC_COMPLEX_10 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_COMPLEX_10) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_COMPLEX_10) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_c16.c b/libgfortran/generated/matmul_c16.c
index c04146be821..03ad0f7df27 100644
--- a/libgfortran/generated/matmul_c16.c
+++ b/libgfortran/generated/matmul_c16.c
@@ -193,8 +193,8 @@ matmul_c16 (gfc_array_c16 * const restrict retarray,
       const GFC_COMPLEX_16 * restrict abase_n;
       GFC_COMPLEX_16 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_COMPLEX_16) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_COMPLEX_16) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_c4.c b/libgfortran/generated/matmul_c4.c
index a01de37bc74..84c94cd586f 100644
--- a/libgfortran/generated/matmul_c4.c
+++ b/libgfortran/generated/matmul_c4.c
@@ -193,8 +193,8 @@ matmul_c4 (gfc_array_c4 * const restrict retarray,
       const GFC_COMPLEX_4 * restrict abase_n;
       GFC_COMPLEX_4 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_COMPLEX_4) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_COMPLEX_4) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_c8.c b/libgfortran/generated/matmul_c8.c
index 75ec4fc101c..f491ea058d7 100644
--- a/libgfortran/generated/matmul_c8.c
+++ b/libgfortran/generated/matmul_c8.c
@@ -193,8 +193,8 @@ matmul_c8 (gfc_array_c8 * const restrict retarray,
       const GFC_COMPLEX_8 * restrict abase_n;
       GFC_COMPLEX_8 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_COMPLEX_8) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_COMPLEX_8) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_i16.c b/libgfortran/generated/matmul_i16.c
index eacc47ff8cd..50d87bb8b0f 100644
--- a/libgfortran/generated/matmul_i16.c
+++ b/libgfortran/generated/matmul_i16.c
@@ -193,8 +193,8 @@ matmul_i16 (gfc_array_i16 * const restrict retarray,
       const GFC_INTEGER_16 * restrict abase_n;
       GFC_INTEGER_16 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_INTEGER_16) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_INTEGER_16) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_i4.c b/libgfortran/generated/matmul_i4.c
index 6166bf18c29..12ac630a549 100644
--- a/libgfortran/generated/matmul_i4.c
+++ b/libgfortran/generated/matmul_i4.c
@@ -193,8 +193,8 @@ matmul_i4 (gfc_array_i4 * const restrict retarray,
       const GFC_INTEGER_4 * restrict abase_n;
       GFC_INTEGER_4 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_INTEGER_4) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_INTEGER_4) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_i8.c b/libgfortran/generated/matmul_i8.c
index b83ded04ebf..82b22292632 100644
--- a/libgfortran/generated/matmul_i8.c
+++ b/libgfortran/generated/matmul_i8.c
@@ -193,8 +193,8 @@ matmul_i8 (gfc_array_i8 * const restrict retarray,
       const GFC_INTEGER_8 * restrict abase_n;
       GFC_INTEGER_8 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_INTEGER_8) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_INTEGER_8) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_r10.c b/libgfortran/generated/matmul_r10.c
index 6702209bd22..73e1e327630 100644
--- a/libgfortran/generated/matmul_r10.c
+++ b/libgfortran/generated/matmul_r10.c
@@ -193,8 +193,8 @@ matmul_r10 (gfc_array_r10 * const restrict retarray,
       const GFC_REAL_10 * restrict abase_n;
       GFC_REAL_10 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_REAL_10) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_REAL_10) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_r16.c b/libgfortran/generated/matmul_r16.c
index c095cbdb747..099c6bf855e 100644
--- a/libgfortran/generated/matmul_r16.c
+++ b/libgfortran/generated/matmul_r16.c
@@ -193,8 +193,8 @@ matmul_r16 (gfc_array_r16 * const restrict retarray,
       const GFC_REAL_16 * restrict abase_n;
       GFC_REAL_16 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_REAL_16) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_REAL_16) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_r4.c b/libgfortran/generated/matmul_r4.c
index dedc5a34961..ca6a4a4360c 100644
--- a/libgfortran/generated/matmul_r4.c
+++ b/libgfortran/generated/matmul_r4.c
@@ -193,8 +193,8 @@ matmul_r4 (gfc_array_r4 * const restrict retarray,
       const GFC_REAL_4 * restrict abase_n;
       GFC_REAL_4 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_REAL_4) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_REAL_4) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)
diff --git a/libgfortran/generated/matmul_r8.c b/libgfortran/generated/matmul_r8.c
index 926a860e386..1844cdc3da8 100644
--- a/libgfortran/generated/matmul_r8.c
+++ b/libgfortran/generated/matmul_r8.c
@@ -193,8 +193,8 @@ matmul_r8 (gfc_array_r8 * const restrict retarray,
       const GFC_REAL_8 * restrict abase_n;
       GFC_REAL_8 bbase_yn;
 
-      if (rystride == ycount)
-	memset (dest, 0, (sizeof (GFC_REAL_8) * size0((array_t *) retarray)));
+      if (rystride == xcount)
+	memset (dest, 0, (sizeof (GFC_REAL_8) * xcount * ycount));
       else
 	{
 	  for (y = 0; y < ycount; y++)