From ae48a63d5a3115bd99ef7384f28224be62fee055 Mon Sep 17 00:00:00 2001
From: rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 7 Dec 2004 00:24:44 +0000
Subject: [PATCH] * intrinsics/cshift0.c, intrinsics/eoshift0.c,
intrinsics/eoshift2.c, intrinsics/pack_generic.c,
intrinsics/string_intrinsics.c, intrinsics/transpose_generic.c,
m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4, m4/transpose.m4: Use
internal_malloc_size instead of internal_malloc. *
generated/*: Rebuild.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91799 138bc75d-0d04-0410-961f-82ee72b054a4
---
libgfortran/ChangeLog | 9 +++++++++
libgfortran/generated/all_l4.c | 6 ++++--
libgfortran/generated/all_l8.c | 6 ++++--
libgfortran/generated/any_l4.c | 6 ++++--
libgfortran/generated/any_l8.c | 6 ++++--
libgfortran/generated/count_4_l4.c | 6 ++++--
libgfortran/generated/count_4_l8.c | 6 ++++--
libgfortran/generated/count_8_l4.c | 6 ++++--
libgfortran/generated/count_8_l8.c | 6 ++++--
libgfortran/generated/matmul_c4.c | 4 ++--
libgfortran/generated/matmul_c8.c | 4 ++--
libgfortran/generated/matmul_i4.c | 4 ++--
libgfortran/generated/matmul_i8.c | 4 ++--
libgfortran/generated/matmul_l4.c | 4 ++--
libgfortran/generated/matmul_l8.c | 4 ++--
libgfortran/generated/matmul_r4.c | 4 ++--
libgfortran/generated/matmul_r8.c | 4 ++--
libgfortran/generated/maxloc1_4_i4.c | 6 ++++--
libgfortran/generated/maxloc1_4_i8.c | 6 ++++--
libgfortran/generated/maxloc1_4_r4.c | 6 ++++--
libgfortran/generated/maxloc1_4_r8.c | 6 ++++--
libgfortran/generated/maxloc1_8_i4.c | 6 ++++--
libgfortran/generated/maxloc1_8_i8.c | 6 ++++--
libgfortran/generated/maxloc1_8_r4.c | 6 ++++--
libgfortran/generated/maxloc1_8_r8.c | 6 ++++--
libgfortran/generated/maxval_i4.c | 6 ++++--
libgfortran/generated/maxval_i8.c | 6 ++++--
libgfortran/generated/maxval_r4.c | 6 ++++--
libgfortran/generated/maxval_r8.c | 6 ++++--
libgfortran/generated/minloc1_4_i4.c | 6 ++++--
libgfortran/generated/minloc1_4_i8.c | 6 ++++--
libgfortran/generated/minloc1_4_r4.c | 6 ++++--
libgfortran/generated/minloc1_4_r8.c | 6 ++++--
libgfortran/generated/minloc1_8_i4.c | 6 ++++--
libgfortran/generated/minloc1_8_i8.c | 6 ++++--
libgfortran/generated/minloc1_8_r4.c | 6 ++++--
libgfortran/generated/minloc1_8_r8.c | 6 ++++--
libgfortran/generated/minval_i4.c | 6 ++++--
libgfortran/generated/minval_i8.c | 6 ++++--
libgfortran/generated/minval_r4.c | 6 ++++--
libgfortran/generated/minval_r8.c | 6 ++++--
libgfortran/generated/product_c4.c | 6 ++++--
libgfortran/generated/product_c8.c | 6 ++++--
libgfortran/generated/product_i4.c | 6 ++++--
libgfortran/generated/product_i8.c | 6 ++++--
libgfortran/generated/product_r4.c | 6 ++++--
libgfortran/generated/product_r8.c | 6 ++++--
libgfortran/generated/sum_c4.c | 6 ++++--
libgfortran/generated/sum_c8.c | 6 ++++--
libgfortran/generated/sum_i4.c | 6 ++++--
libgfortran/generated/sum_i8.c | 6 ++++--
libgfortran/generated/sum_r4.c | 6 ++++--
libgfortran/generated/sum_r8.c | 6 ++++--
libgfortran/generated/transpose_i4.c | 2 +-
libgfortran/generated/transpose_i8.c | 2 +-
libgfortran/intrinsics/cshift0.c | 2 +-
libgfortran/intrinsics/eoshift0.c | 2 +-
libgfortran/intrinsics/eoshift2.c | 2 +-
libgfortran/intrinsics/pack_generic.c | 6 +++---
libgfortran/intrinsics/string_intrinsics.c | 2 +-
libgfortran/intrinsics/transpose_generic.c | 2 +-
libgfortran/m4/ifunction.m4 | 6 ++++--
libgfortran/m4/matmul.m4 | 4 ++--
libgfortran/m4/matmull.m4 | 4 ++--
libgfortran/m4/transpose.m4 | 2 +-
65 files changed, 220 insertions(+), 121 deletions(-)
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 50dde4e40e0c..ec9792aebfc9 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-06 Richard Henderson <rth@redhat.com>
+
+ * intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
+ intrinsics/pack_generic.c, intrinsics/string_intrinsics.c,
+ intrinsics/transpose_generic.c, m4/ifunction.m4, m4/matmul.m4,
+ m4/matmull.m4, m4/transpose.m4: Use internal_malloc_size instead
+ of internal_malloc.
+ * generated/*: Rebuild.
+
2004-12-06 Richard Henderson <rth@redhat.com>
* intrinsics/c99_functions.c, intrinsics/eoshift0.c,
diff --git a/libgfortran/generated/all_l4.c b/libgfortran/generated/all_l4.c
index 671684fa57f4..5a517c1c3302 100644
--- a/libgfortran/generated/all_l4.c
+++ b/libgfortran/generated/all_l4.c
@@ -75,8 +75,10 @@ __all_l4 (gfc_array_l4 * retarray, gfc_array_l4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_LOGICAL_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_LOGICAL_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/all_l8.c b/libgfortran/generated/all_l8.c
index 3f418ccc45f8..a58396381a51 100644
--- a/libgfortran/generated/all_l8.c
+++ b/libgfortran/generated/all_l8.c
@@ -75,8 +75,10 @@ __all_l8 (gfc_array_l8 * retarray, gfc_array_l8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_LOGICAL_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_LOGICAL_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/any_l4.c b/libgfortran/generated/any_l4.c
index 64cd6757a48b..93beea72696f 100644
--- a/libgfortran/generated/any_l4.c
+++ b/libgfortran/generated/any_l4.c
@@ -75,8 +75,10 @@ __any_l4 (gfc_array_l4 * retarray, gfc_array_l4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_LOGICAL_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_LOGICAL_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/any_l8.c b/libgfortran/generated/any_l8.c
index c9f418dcd07a..bc0ede896a74 100644
--- a/libgfortran/generated/any_l8.c
+++ b/libgfortran/generated/any_l8.c
@@ -75,8 +75,10 @@ __any_l8 (gfc_array_l8 * retarray, gfc_array_l8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_LOGICAL_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_LOGICAL_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/count_4_l4.c b/libgfortran/generated/count_4_l4.c
index 626ebf944e75..9c33c2e6d0d9 100644
--- a/libgfortran/generated/count_4_l4.c
+++ b/libgfortran/generated/count_4_l4.c
@@ -75,8 +75,10 @@ __count_4_l4 (gfc_array_i4 * retarray, gfc_array_l4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/count_4_l8.c b/libgfortran/generated/count_4_l8.c
index 2db569aac500..288aa3ad7069 100644
--- a/libgfortran/generated/count_4_l8.c
+++ b/libgfortran/generated/count_4_l8.c
@@ -75,8 +75,10 @@ __count_4_l8 (gfc_array_i4 * retarray, gfc_array_l8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/count_8_l4.c b/libgfortran/generated/count_8_l4.c
index dadbc96fb4ec..bf83d3e3c186 100644
--- a/libgfortran/generated/count_8_l4.c
+++ b/libgfortran/generated/count_8_l4.c
@@ -75,8 +75,10 @@ __count_8_l4 (gfc_array_i8 * retarray, gfc_array_l4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/count_8_l8.c b/libgfortran/generated/count_8_l8.c
index d453e01e45b4..ef05c6db7b84 100644
--- a/libgfortran/generated/count_8_l8.c
+++ b/libgfortran/generated/count_8_l8.c
@@ -75,8 +75,10 @@ __count_8_l8 (gfc_array_i8 * retarray, gfc_array_l8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/matmul_c4.c b/libgfortran/generated/matmul_c4.c
index fd265d8b5b13..19e4f239cca4 100644
--- a/libgfortran/generated/matmul_c4.c
+++ b/libgfortran/generated/matmul_c4.c
@@ -86,7 +86,8 @@ __matmul_c4 (gfc_array_c4 * retarray, gfc_array_c4 * a, gfc_array_c4 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_COMPLEX_4) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_COMPLEX_4) * size0 (retarray));
retarray->base = 0;
}
@@ -199,4 +200,3 @@ __matmul_c4 (gfc_array_c4 * retarray, gfc_array_c4 * a, gfc_array_c4 * b)
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
}
}
-
diff --git a/libgfortran/generated/matmul_c8.c b/libgfortran/generated/matmul_c8.c
index bc51e4a9db3c..fb422cba5f40 100644
--- a/libgfortran/generated/matmul_c8.c
+++ b/libgfortran/generated/matmul_c8.c
@@ -86,7 +86,8 @@ __matmul_c8 (gfc_array_c8 * retarray, gfc_array_c8 * a, gfc_array_c8 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_COMPLEX_8) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_COMPLEX_8) * size0 (retarray));
retarray->base = 0;
}
@@ -199,4 +200,3 @@ __matmul_c8 (gfc_array_c8 * retarray, gfc_array_c8 * a, gfc_array_c8 * b)
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
}
}
-
diff --git a/libgfortran/generated/matmul_i4.c b/libgfortran/generated/matmul_i4.c
index 7b8cfbdd995c..e5f534a169d0 100644
--- a/libgfortran/generated/matmul_i4.c
+++ b/libgfortran/generated/matmul_i4.c
@@ -86,7 +86,8 @@ __matmul_i4 (gfc_array_i4 * retarray, gfc_array_i4 * a, gfc_array_i4 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4) * size0 (retarray));
retarray->base = 0;
}
@@ -199,4 +200,3 @@ __matmul_i4 (gfc_array_i4 * retarray, gfc_array_i4 * a, gfc_array_i4 * b)
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
}
}
-
diff --git a/libgfortran/generated/matmul_i8.c b/libgfortran/generated/matmul_i8.c
index c84c02413018..88bbf7a33885 100644
--- a/libgfortran/generated/matmul_i8.c
+++ b/libgfortran/generated/matmul_i8.c
@@ -86,7 +86,8 @@ __matmul_i8 (gfc_array_i8 * retarray, gfc_array_i8 * a, gfc_array_i8 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8) * size0 (retarray));
retarray->base = 0;
}
@@ -199,4 +200,3 @@ __matmul_i8 (gfc_array_i8 * retarray, gfc_array_i8 * a, gfc_array_i8 * b)
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
}
}
-
diff --git a/libgfortran/generated/matmul_l4.c b/libgfortran/generated/matmul_l4.c
index 80e648236755..1af2eb0c6f8c 100644
--- a/libgfortran/generated/matmul_l4.c
+++ b/libgfortran/generated/matmul_l4.c
@@ -76,7 +76,8 @@ __matmul_l4 (gfc_array_l4 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_LOGICAL_4) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_LOGICAL_4) * size0 (retarray));
retarray->base = 0;
}
@@ -178,4 +179,3 @@ __matmul_l4 (gfc_array_l4 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
dest += rystride - (rxstride * xcount);
}
}
-
diff --git a/libgfortran/generated/matmul_l8.c b/libgfortran/generated/matmul_l8.c
index c842146e2d07..d6d85a1e2883 100644
--- a/libgfortran/generated/matmul_l8.c
+++ b/libgfortran/generated/matmul_l8.c
@@ -76,7 +76,8 @@ __matmul_l8 (gfc_array_l8 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_LOGICAL_8) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_LOGICAL_8) * size0 (retarray));
retarray->base = 0;
}
@@ -178,4 +179,3 @@ __matmul_l8 (gfc_array_l8 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
dest += rystride - (rxstride * xcount);
}
}
-
diff --git a/libgfortran/generated/matmul_r4.c b/libgfortran/generated/matmul_r4.c
index 6896a2e9bef3..91417ccd1cd9 100644
--- a/libgfortran/generated/matmul_r4.c
+++ b/libgfortran/generated/matmul_r4.c
@@ -86,7 +86,8 @@ __matmul_r4 (gfc_array_r4 * retarray, gfc_array_r4 * a, gfc_array_r4 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_4) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_4) * size0 (retarray));
retarray->base = 0;
}
@@ -199,4 +200,3 @@ __matmul_r4 (gfc_array_r4 * retarray, gfc_array_r4 * a, gfc_array_r4 * b)
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
}
}
-
diff --git a/libgfortran/generated/matmul_r8.c b/libgfortran/generated/matmul_r8.c
index f0fc1a64a858..2fc3fed4be39 100644
--- a/libgfortran/generated/matmul_r8.c
+++ b/libgfortran/generated/matmul_r8.c
@@ -86,7 +86,8 @@ __matmul_r8 (gfc_array_r8 * retarray, gfc_array_r8 * a, gfc_array_r8 * b)
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_8) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_8) * size0 (retarray));
retarray->base = 0;
}
@@ -199,4 +200,3 @@ __matmul_r8 (gfc_array_r8 * retarray, gfc_array_r8 * a, gfc_array_r8 * b)
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
}
}
-
diff --git a/libgfortran/generated/maxloc1_4_i4.c b/libgfortran/generated/maxloc1_4_i4.c
index f2a3718482a2..2369e77cc8b6 100644
--- a/libgfortran/generated/maxloc1_4_i4.c
+++ b/libgfortran/generated/maxloc1_4_i4.c
@@ -77,8 +77,10 @@ __maxloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxloc1_4_i8.c b/libgfortran/generated/maxloc1_4_i8.c
index 25a93bae5e57..36860c2ea0ca 100644
--- a/libgfortran/generated/maxloc1_4_i8.c
+++ b/libgfortran/generated/maxloc1_4_i8.c
@@ -77,8 +77,10 @@ __maxloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxloc1_4_r4.c b/libgfortran/generated/maxloc1_4_r4.c
index 5dbf0e6442ee..6d550d55149a 100644
--- a/libgfortran/generated/maxloc1_4_r4.c
+++ b/libgfortran/generated/maxloc1_4_r4.c
@@ -77,8 +77,10 @@ __maxloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxloc1_4_r8.c b/libgfortran/generated/maxloc1_4_r8.c
index 90b81865128f..07a9ecad815e 100644
--- a/libgfortran/generated/maxloc1_4_r8.c
+++ b/libgfortran/generated/maxloc1_4_r8.c
@@ -77,8 +77,10 @@ __maxloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxloc1_8_i4.c b/libgfortran/generated/maxloc1_8_i4.c
index a705e79d794e..79142592cfb4 100644
--- a/libgfortran/generated/maxloc1_8_i4.c
+++ b/libgfortran/generated/maxloc1_8_i4.c
@@ -77,8 +77,10 @@ __maxloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxloc1_8_i8.c b/libgfortran/generated/maxloc1_8_i8.c
index 5edd7d480a59..46a7561089ad 100644
--- a/libgfortran/generated/maxloc1_8_i8.c
+++ b/libgfortran/generated/maxloc1_8_i8.c
@@ -77,8 +77,10 @@ __maxloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxloc1_8_r4.c b/libgfortran/generated/maxloc1_8_r4.c
index 5476736e2054..1ab1be85a959 100644
--- a/libgfortran/generated/maxloc1_8_r4.c
+++ b/libgfortran/generated/maxloc1_8_r4.c
@@ -77,8 +77,10 @@ __maxloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxloc1_8_r8.c b/libgfortran/generated/maxloc1_8_r8.c
index 0fba535c9750..b221baae4c3d 100644
--- a/libgfortran/generated/maxloc1_8_r8.c
+++ b/libgfortran/generated/maxloc1_8_r8.c
@@ -77,8 +77,10 @@ __maxloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxval_i4.c b/libgfortran/generated/maxval_i4.c
index 90fc202331d3..8d37dfee18aa 100644
--- a/libgfortran/generated/maxval_i4.c
+++ b/libgfortran/generated/maxval_i4.c
@@ -76,8 +76,10 @@ __maxval_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxval_i8.c b/libgfortran/generated/maxval_i8.c
index 9746503707bd..bdb33c9ce656 100644
--- a/libgfortran/generated/maxval_i8.c
+++ b/libgfortran/generated/maxval_i8.c
@@ -76,8 +76,10 @@ __maxval_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxval_r4.c b/libgfortran/generated/maxval_r4.c
index de999ab390e4..78e83dcbe785 100644
--- a/libgfortran/generated/maxval_r4.c
+++ b/libgfortran/generated/maxval_r4.c
@@ -76,8 +76,10 @@ __maxval_r4 (gfc_array_r4 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/maxval_r8.c b/libgfortran/generated/maxval_r8.c
index fa357b443fa2..e3c74539aed0 100644
--- a/libgfortran/generated/maxval_r8.c
+++ b/libgfortran/generated/maxval_r8.c
@@ -76,8 +76,10 @@ __maxval_r8 (gfc_array_r8 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_4_i4.c b/libgfortran/generated/minloc1_4_i4.c
index be9ae2e452d7..ce739168dfcf 100644
--- a/libgfortran/generated/minloc1_4_i4.c
+++ b/libgfortran/generated/minloc1_4_i4.c
@@ -77,8 +77,10 @@ __minloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_4_i8.c b/libgfortran/generated/minloc1_4_i8.c
index 2f17baacbf05..55a249beacb4 100644
--- a/libgfortran/generated/minloc1_4_i8.c
+++ b/libgfortran/generated/minloc1_4_i8.c
@@ -77,8 +77,10 @@ __minloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_4_r4.c b/libgfortran/generated/minloc1_4_r4.c
index 7f3449f716b2..50adeb33cba9 100644
--- a/libgfortran/generated/minloc1_4_r4.c
+++ b/libgfortran/generated/minloc1_4_r4.c
@@ -77,8 +77,10 @@ __minloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_4_r8.c b/libgfortran/generated/minloc1_4_r8.c
index 226d7271c069..aafb578cc2ef 100644
--- a/libgfortran/generated/minloc1_4_r8.c
+++ b/libgfortran/generated/minloc1_4_r8.c
@@ -77,8 +77,10 @@ __minloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_8_i4.c b/libgfortran/generated/minloc1_8_i4.c
index 1d1c3d406aab..5c347dd12b58 100644
--- a/libgfortran/generated/minloc1_8_i4.c
+++ b/libgfortran/generated/minloc1_8_i4.c
@@ -77,8 +77,10 @@ __minloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_8_i8.c b/libgfortran/generated/minloc1_8_i8.c
index f7b46c17cf7c..c8811f36ffab 100644
--- a/libgfortran/generated/minloc1_8_i8.c
+++ b/libgfortran/generated/minloc1_8_i8.c
@@ -77,8 +77,10 @@ __minloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_8_r4.c b/libgfortran/generated/minloc1_8_r4.c
index d71d05621ea8..81ba16721167 100644
--- a/libgfortran/generated/minloc1_8_r4.c
+++ b/libgfortran/generated/minloc1_8_r4.c
@@ -77,8 +77,10 @@ __minloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minloc1_8_r8.c b/libgfortran/generated/minloc1_8_r8.c
index 7de9a2e0377d..684eab265652 100644
--- a/libgfortran/generated/minloc1_8_r8.c
+++ b/libgfortran/generated/minloc1_8_r8.c
@@ -77,8 +77,10 @@ __minloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minval_i4.c b/libgfortran/generated/minval_i4.c
index e2e68237601e..784645297d94 100644
--- a/libgfortran/generated/minval_i4.c
+++ b/libgfortran/generated/minval_i4.c
@@ -76,8 +76,10 @@ __minval_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minval_i8.c b/libgfortran/generated/minval_i8.c
index 4b7bac6b5329..deca048917ac 100644
--- a/libgfortran/generated/minval_i8.c
+++ b/libgfortran/generated/minval_i8.c
@@ -76,8 +76,10 @@ __minval_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minval_r4.c b/libgfortran/generated/minval_r4.c
index 8d4e49055be9..8990d88b3f2a 100644
--- a/libgfortran/generated/minval_r4.c
+++ b/libgfortran/generated/minval_r4.c
@@ -76,8 +76,10 @@ __minval_r4 (gfc_array_r4 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/minval_r8.c b/libgfortran/generated/minval_r8.c
index 8300f7496813..285e90e016dc 100644
--- a/libgfortran/generated/minval_r8.c
+++ b/libgfortran/generated/minval_r8.c
@@ -76,8 +76,10 @@ __minval_r8 (gfc_array_r8 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/product_c4.c b/libgfortran/generated/product_c4.c
index c69295123ef2..0337ec61c0ed 100644
--- a/libgfortran/generated/product_c4.c
+++ b/libgfortran/generated/product_c4.c
@@ -75,8 +75,10 @@ __product_c4 (gfc_array_c4 * retarray, gfc_array_c4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_COMPLEX_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_COMPLEX_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/product_c8.c b/libgfortran/generated/product_c8.c
index 68a678586bb3..22a26a8e739a 100644
--- a/libgfortran/generated/product_c8.c
+++ b/libgfortran/generated/product_c8.c
@@ -75,8 +75,10 @@ __product_c8 (gfc_array_c8 * retarray, gfc_array_c8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_COMPLEX_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_COMPLEX_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/product_i4.c b/libgfortran/generated/product_i4.c
index 889d4c1bd67f..c50c07f068bc 100644
--- a/libgfortran/generated/product_i4.c
+++ b/libgfortran/generated/product_i4.c
@@ -75,8 +75,10 @@ __product_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/product_i8.c b/libgfortran/generated/product_i8.c
index 74e0459c6b9e..0f09a411b51d 100644
--- a/libgfortran/generated/product_i8.c
+++ b/libgfortran/generated/product_i8.c
@@ -75,8 +75,10 @@ __product_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/product_r4.c b/libgfortran/generated/product_r4.c
index e18139d6b1b7..f68a88ab8355 100644
--- a/libgfortran/generated/product_r4.c
+++ b/libgfortran/generated/product_r4.c
@@ -75,8 +75,10 @@ __product_r4 (gfc_array_r4 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/product_r8.c b/libgfortran/generated/product_r8.c
index ce29c1a8ca29..0936d181232d 100644
--- a/libgfortran/generated/product_r8.c
+++ b/libgfortran/generated/product_r8.c
@@ -75,8 +75,10 @@ __product_r8 (gfc_array_r8 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/sum_c4.c b/libgfortran/generated/sum_c4.c
index 36e20e2e81c4..6507de887971 100644
--- a/libgfortran/generated/sum_c4.c
+++ b/libgfortran/generated/sum_c4.c
@@ -75,8 +75,10 @@ __sum_c4 (gfc_array_c4 * retarray, gfc_array_c4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_COMPLEX_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_COMPLEX_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/sum_c8.c b/libgfortran/generated/sum_c8.c
index 971c597341ee..bc2d045e667d 100644
--- a/libgfortran/generated/sum_c8.c
+++ b/libgfortran/generated/sum_c8.c
@@ -75,8 +75,10 @@ __sum_c8 (gfc_array_c8 * retarray, gfc_array_c8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_COMPLEX_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_COMPLEX_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/sum_i4.c b/libgfortran/generated/sum_i4.c
index 628a07756f44..aac7f482e92d 100644
--- a/libgfortran/generated/sum_i4.c
+++ b/libgfortran/generated/sum_i4.c
@@ -75,8 +75,10 @@ __sum_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/sum_i8.c b/libgfortran/generated/sum_i8.c
index 536719dd7e46..e9a539d992d5 100644
--- a/libgfortran/generated/sum_i8.c
+++ b/libgfortran/generated/sum_i8.c
@@ -75,8 +75,10 @@ __sum_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_INTEGER_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_INTEGER_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/sum_r4.c b/libgfortran/generated/sum_r4.c
index 611a1131739e..11b5c4944837 100644
--- a/libgfortran/generated/sum_r4.c
+++ b/libgfortran/generated/sum_r4.c
@@ -75,8 +75,10 @@ __sum_r4 (gfc_array_r4 * retarray, gfc_array_r4 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_4) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_4)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/sum_r8.c b/libgfortran/generated/sum_r8.c
index bdc93e0e47a1..95272fb1f16b 100644
--- a/libgfortran/generated/sum_r8.c
+++ b/libgfortran/generated/sum_r8.c
@@ -75,8 +75,10 @@ __sum_r8 (gfc_array_r8 * retarray, gfc_array_r8 *array, index_type *pdim)
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (GFC_REAL_8) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (GFC_REAL_8)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/generated/transpose_i4.c b/libgfortran/generated/transpose_i4.c
index 97eb1a0d1406..dad2987fca74 100644
--- a/libgfortran/generated/transpose_i4.c
+++ b/libgfortran/generated/transpose_i4.c
@@ -51,7 +51,7 @@ __transpose_4 (gfc_array_i4 * ret, gfc_array_i4 * source)
ret->dim[1].ubound = source->dim[0].ubound - source->dim[0].lbound;
ret->dim[1].stride = ret->dim[0].ubound+1;
- ret->data = internal_malloc (sizeof (GFC_INTEGER_4) * size0 (ret));
+ ret->data = internal_malloc_size (sizeof (GFC_INTEGER_4) * size0 (ret));
ret->base = 0;
}
diff --git a/libgfortran/generated/transpose_i8.c b/libgfortran/generated/transpose_i8.c
index 4c842d48520a..84811d0d012f 100644
--- a/libgfortran/generated/transpose_i8.c
+++ b/libgfortran/generated/transpose_i8.c
@@ -51,7 +51,7 @@ __transpose_8 (gfc_array_i8 * ret, gfc_array_i8 * source)
ret->dim[1].ubound = source->dim[0].ubound - source->dim[0].lbound;
ret->dim[1].stride = ret->dim[0].ubound+1;
- ret->data = internal_malloc (sizeof (GFC_INTEGER_8) * size0 (ret));
+ ret->data = internal_malloc_size (sizeof (GFC_INTEGER_8) * size0 (ret));
ret->base = 0;
}
diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c
index a988827a826e..6d7a80188671 100644
--- a/libgfortran/intrinsics/cshift0.c
+++ b/libgfortran/intrinsics/cshift0.c
@@ -109,7 +109,7 @@ __cshift0 (gfc_array_char * ret, const gfc_array_char * array,
{
int i;
- ret->data = internal_malloc (size * size0 ((array_t *)array));
+ ret->data = internal_malloc_size (size * size0 ((array_t *)array));
ret->base = 0;
ret->dtype = array->dtype;
for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++)
diff --git a/libgfortran/intrinsics/eoshift0.c b/libgfortran/intrinsics/eoshift0.c
index 2f7a0338461a..db9dd657200e 100644
--- a/libgfortran/intrinsics/eoshift0.c
+++ b/libgfortran/intrinsics/eoshift0.c
@@ -64,7 +64,7 @@ __eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
{
int i;
- ret->data = internal_malloc (size * size0 ((array_t *)array));
+ ret->data = internal_malloc_size (size * size0 ((array_t *)array));
ret->base = 0;
ret->dtype = array->dtype;
for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++)
diff --git a/libgfortran/intrinsics/eoshift2.c b/libgfortran/intrinsics/eoshift2.c
index c89c5c59d906..a20da5525854 100644
--- a/libgfortran/intrinsics/eoshift2.c
+++ b/libgfortran/intrinsics/eoshift2.c
@@ -65,7 +65,7 @@ __eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
{
int i;
- ret->data = internal_malloc (size * size0 ((array_t *)array));
+ ret->data = internal_malloc_size (size * size0 ((array_t *)array));
ret->base = 0;
ret->dtype = array->dtype;
for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++)
diff --git a/libgfortran/intrinsics/pack_generic.c b/libgfortran/intrinsics/pack_generic.c
index da0bc5798271..75a8661ba8ff 100644
--- a/libgfortran/intrinsics/pack_generic.c
+++ b/libgfortran/intrinsics/pack_generic.c
@@ -188,7 +188,7 @@ __pack (gfc_array_char * ret, const gfc_array_char * array,
ret->dim[0].ubound = total - 1;
ret->dim[0].stride = 1;
- ret->data = internal_malloc (size * total);
+ ret->data = internal_malloc_size (size * total);
ret->base = 0;
if (total == 0)
@@ -325,7 +325,7 @@ __pack_s (gfc_array_char * ret, const gfc_array_char * array,
ret->dim[0].lbound = 0;
ret->dim[0].ubound = -1;
ret->dim[0].stride = 1;
- ret->data = internal_malloc (0);
+ ret->data = internal_malloc_size (0);
ret->base = 0;
return;
@@ -337,7 +337,7 @@ __pack_s (gfc_array_char * ret, const gfc_array_char * array,
ret->dim[0].ubound = total - 1;
ret->dim[0].stride = 1;
- ret->data = internal_malloc (size * total);
+ ret->data = internal_malloc_size (size * total);
ret->base = 0;
}
diff --git a/libgfortran/intrinsics/string_intrinsics.c b/libgfortran/intrinsics/string_intrinsics.c
index 53d9b4e99029..faacaab56f84 100644
--- a/libgfortran/intrinsics/string_intrinsics.c
+++ b/libgfortran/intrinsics/string_intrinsics.c
@@ -184,7 +184,7 @@ string_trim (GFC_INTEGER_4 * len, void ** dest, GFC_INTEGER_4 slen,
if (*len > 0)
{
/* Allocate space for result string. */
- *dest = internal_malloc (*len);
+ *dest = internal_malloc_size (*len);
/* copy string if necessary. */
memmove (*dest, src, *len);
diff --git a/libgfortran/intrinsics/transpose_generic.c b/libgfortran/intrinsics/transpose_generic.c
index ad08ea7893a3..55d2729aea93 100644
--- a/libgfortran/intrinsics/transpose_generic.c
+++ b/libgfortran/intrinsics/transpose_generic.c
@@ -56,7 +56,7 @@ __transpose (gfc_array_char * ret, gfc_array_char * source)
ret->dim[1].ubound = source->dim[0].ubound - source->dim[0].lbound;
ret->dim[1].stride = ret->dim[0].ubound+1;
- ret->data = internal_malloc (size * size0 ((array_t*)ret));
+ ret->data = internal_malloc_size (size * size0 ((array_t*)ret));
ret->base = 0;
}
diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4
index 14bd0a639974..93b31973e1c9 100644
--- a/libgfortran/m4/ifunction.m4
+++ b/libgfortran/m4/ifunction.m4
@@ -69,8 +69,10 @@ define(START_ARRAY_FUNCTION,
retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
}
- retarray->data = internal_malloc (sizeof (rtype_name) *
- (retarray->dim[rank-1].stride * extent[rank-1]));
+ retarray->data
+ = internal_malloc_size (sizeof (rtype_name)
+ * retarray->dim[rank-1].stride
+ * extent[rank-1]);
retarray->base = 0;
}
diff --git a/libgfortran/m4/matmul.m4 b/libgfortran/m4/matmul.m4
index 0602be690615..9af77ceea503 100644
--- a/libgfortran/m4/matmul.m4
+++ b/libgfortran/m4/matmul.m4
@@ -87,7 +87,8 @@ void
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (rtype_name) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (rtype_name) * size0 (retarray));
retarray->base = 0;
}
@@ -201,4 +202,3 @@ sinclude(`matmul_asm_'rtype_code`.m4')dnl
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
}
}
-
diff --git a/libgfortran/m4/matmull.m4 b/libgfortran/m4/matmull.m4
index 804127ec0055..0d66a42a4e22 100644
--- a/libgfortran/m4/matmull.m4
+++ b/libgfortran/m4/matmull.m4
@@ -77,7 +77,8 @@ void
retarray->dim[1].stride = retarray->dim[0].ubound+1;
}
- retarray->data = internal_malloc (sizeof (rtype_name) * size0 (retarray));
+ retarray->data
+ = internal_malloc_size (sizeof (rtype_name) * size0 (retarray));
retarray->base = 0;
}
@@ -180,4 +181,3 @@ sinclude(`matmul_asm_'rtype_code`.m4')dnl
dest += rystride - (rxstride * xcount);
}
}
-
diff --git a/libgfortran/m4/transpose.m4 b/libgfortran/m4/transpose.m4
index 5fd6acfb2285..55f4b572917b 100644
--- a/libgfortran/m4/transpose.m4
+++ b/libgfortran/m4/transpose.m4
@@ -52,7 +52,7 @@ void
ret->dim[1].ubound = source->dim[0].ubound - source->dim[0].lbound;
ret->dim[1].stride = ret->dim[0].ubound+1;
- ret->data = internal_malloc (sizeof (rtype_name) * size0 (ret));
+ ret->data = internal_malloc_size (sizeof (rtype_name) * size0 (ret));
ret->base = 0;
}
--
GitLab