diff options
| author | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-10 14:06:57 +0000 |
|---|---|---|
| committer | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-10 14:06:57 +0000 |
| commit | d739de27bea1277b687224767d2180452ea4caef (patch) | |
| tree | 303ef4034482868b0cf815e63a86849b0dc556b9 | |
| parent | c91d684458cd7b47b7bde87edb4c80b3c999836c (diff) | |
| download | gcc-d739de27bea1277b687224767d2180452ea4caef.tar.gz | |
2011-09-10 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/49479
* generated/m4/ifunction.m4: Always call internal_malloc_size
even when there is a zero-sized return array.
* generated/generated/maxloc1_16_i16.c: Regenerated.
* generated/generated/maxloc1_16_i1.c: Regenerated.
* generated/generated/maxloc1_16_i2.c: Regenerated.
* generated/generated/maxloc1_16_i4.c: Regenerated.
* generated/generated/maxloc1_16_i8.c: Regenerated.
* generated/generated/maxloc1_16_r10.c: Regenerated.
* generated/generated/maxloc1_16_r16.c: Regenerated.
* generated/generated/maxloc1_16_r4.c: Regenerated.
* generated/generated/maxloc1_16_r8.c: Regenerated.
* generated/generated/maxloc1_4_i16.c: Regenerated.
* generated/generated/maxloc1_4_i1.c: Regenerated.
* generated/generated/maxloc1_4_i2.c: Regenerated.
* generated/generated/maxloc1_4_i4.c: Regenerated.
* generated/generated/maxloc1_4_i8.c: Regenerated.
* generated/generated/maxloc1_4_r10.c: Regenerated.
* generated/generated/maxloc1_4_r16.c: Regenerated.
* generated/generated/maxloc1_4_r4.c: Regenerated.
* generated/generated/maxloc1_4_r8.c: Regenerated.
* generated/generated/maxloc1_8_i16.c: Regenerated.
* generated/generated/maxloc1_8_i1.c: Regenerated.
* generated/generated/maxloc1_8_i2.c: Regenerated.
* generated/generated/maxloc1_8_i4.c: Regenerated.
* generated/generated/maxloc1_8_i8.c: Regenerated.
* generated/generated/maxloc1_8_r10.c: Regenerated.
* generated/generated/maxloc1_8_r16.c: Regenerated.
* generated/generated/maxloc1_8_r4.c: Regenerated.
* generated/generated/maxloc1_8_r8.c: Regenerated.
* generated/generated/maxval_i16.c: Regenerated.
* generated/generated/maxval_i1.c: Regenerated.
* generated/generated/maxval_i2.c: Regenerated.
* generated/generated/maxval_i4.c: Regenerated.
* generated/generated/maxval_i8.c: Regenerated.
* generated/generated/maxval_r10.c: Regenerated.
* generated/generated/maxval_r16.c: Regenerated.
* generated/generated/maxval_r4.c: Regenerated.
* generated/generated/maxval_r8.c: Regenerated.
* generated/generated/minloc1_16_i16.c: Regenerated.
* generated/generated/minloc1_16_i1.c: Regenerated.
* generated/generated/minloc1_16_i2.c: Regenerated.
* generated/generated/minloc1_16_i4.c: Regenerated.
* generated/generated/minloc1_16_i8.c: Regenerated.
* generated/generated/minloc1_16_r10.c: Regenerated.
* generated/generated/minloc1_16_r16.c: Regenerated.
* generated/generated/minloc1_16_r4.c: Regenerated.
* generated/generated/minloc1_16_r8.c: Regenerated.
* generated/generated/minloc1_4_i16.c: Regenerated.
* generated/generated/minloc1_4_i1.c: Regenerated.
* generated/generated/minloc1_4_i2.c: Regenerated.
* generated/generated/minloc1_4_i4.c: Regenerated.
* generated/generated/minloc1_4_i8.c: Regenerated.
* generated/generated/minloc1_4_r10.c: Regenerated.
* generated/generated/minloc1_4_r16.c: Regenerated.
* generated/generated/minloc1_4_r4.c: Regenerated.
* generated/generated/minloc1_4_r8.c: Regenerated.
* generated/generated/minloc1_8_i16.c: Regenerated.
* generated/generated/minloc1_8_i1.c: Regenerated.
* generated/generated/minloc1_8_i2.c: Regenerated.
* generated/generated/minloc1_8_i4.c: Regenerated.
* generated/generated/minloc1_8_i8.c: Regenerated.
* generated/generated/minloc1_8_r10.c: Regenerated.
* generated/generated/minloc1_8_r16.c: Regenerated.
* generated/generated/minloc1_8_r4.c: Regenerated.
* generated/generated/minloc1_8_r8.c: Regenerated.
* generated/generated/minval_i16.c: Regenerated.
* generated/generated/minval_i1.c: Regenerated.
* generated/generated/minval_i2.c: Regenerated.
* generated/generated/minval_i4.c: Regenerated.
* generated/generated/minval_i8.c: Regenerated.
* generated/generated/minval_r10.c: Regenerated.
* generated/generated/minval_r16.c: Regenerated.
* generated/generated/minval_r4.c: Regenerated.
* generated/generated/minval_r8.c: Regenerated.
* generated/generated/product_c10.c: Regenerated.
* generated/generated/product_c16.c: Regenerated.
* generated/generated/product_c4.c: Regenerated.
* generated/generated/product_c8.c: Regenerated.
* generated/generated/product_i16.c: Regenerated.
* generated/generated/product_i1.c: Regenerated.
* generated/generated/product_i2.c: Regenerated.
* generated/generated/product_i4.c: Regenerated.
* generated/generated/product_i8.c: Regenerated.
* generated/generated/product_r10.c: Regenerated.
* generated/generated/product_r16.c: Regenerated.
* generated/generated/product_r4.c: Regenerated.
* generated/generated/product_r8.c: Regenerated.
* generated/generated/sum_c10.c: Regenerated.
* generated/generated/sum_c16.c: Regenerated.
* generated/generated/sum_c4.c: Regenerated.
* generated/generated/sum_c8.c: Regenerated.
* generated/generated/sum_i16.c: Regenerated.
* generated/generated/sum_i1.c: Regenerated.
* generated/generated/sum_i2.c: Regenerated.
* generated/generated/sum_i4.c: Regenerated.
* generated/generated/sum_i8.c: Regenerated.
* generated/generated/sum_r10.c: Regenerated.
* generated/generated/sum_r16.c: Regenerated.
* generated/generated/sum_r4.c: Regenerated.
* generated/generated/sum_r8.c: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178748 138bc75d-0d04-0410-961f-82ee72b054a4
100 files changed, 203 insertions, 198 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 1ea792f92c6..4546c276dfa 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,107 @@ +2011-09-10 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/49479 + * generated/m4/ifunction.m4: Always call internal_malloc_size + even when there is a zero-sized return array. + * generated/generated/maxloc1_16_i16.c: Regenerated. + * generated/generated/maxloc1_16_i1.c: Regenerated. + * generated/generated/maxloc1_16_i2.c: Regenerated. + * generated/generated/maxloc1_16_i4.c: Regenerated. + * generated/generated/maxloc1_16_i8.c: Regenerated. + * generated/generated/maxloc1_16_r10.c: Regenerated. + * generated/generated/maxloc1_16_r16.c: Regenerated. + * generated/generated/maxloc1_16_r4.c: Regenerated. + * generated/generated/maxloc1_16_r8.c: Regenerated. + * generated/generated/maxloc1_4_i16.c: Regenerated. + * generated/generated/maxloc1_4_i1.c: Regenerated. + * generated/generated/maxloc1_4_i2.c: Regenerated. + * generated/generated/maxloc1_4_i4.c: Regenerated. + * generated/generated/maxloc1_4_i8.c: Regenerated. + * generated/generated/maxloc1_4_r10.c: Regenerated. + * generated/generated/maxloc1_4_r16.c: Regenerated. + * generated/generated/maxloc1_4_r4.c: Regenerated. + * generated/generated/maxloc1_4_r8.c: Regenerated. + * generated/generated/maxloc1_8_i16.c: Regenerated. + * generated/generated/maxloc1_8_i1.c: Regenerated. + * generated/generated/maxloc1_8_i2.c: Regenerated. + * generated/generated/maxloc1_8_i4.c: Regenerated. + * generated/generated/maxloc1_8_i8.c: Regenerated. + * generated/generated/maxloc1_8_r10.c: Regenerated. + * generated/generated/maxloc1_8_r16.c: Regenerated. + * generated/generated/maxloc1_8_r4.c: Regenerated. + * generated/generated/maxloc1_8_r8.c: Regenerated. + * generated/generated/maxval_i16.c: Regenerated. + * generated/generated/maxval_i1.c: Regenerated. + * generated/generated/maxval_i2.c: Regenerated. + * generated/generated/maxval_i4.c: Regenerated. + * generated/generated/maxval_i8.c: Regenerated. + * generated/generated/maxval_r10.c: Regenerated. + * generated/generated/maxval_r16.c: Regenerated. + * generated/generated/maxval_r4.c: Regenerated. + * generated/generated/maxval_r8.c: Regenerated. + * generated/generated/minloc1_16_i16.c: Regenerated. + * generated/generated/minloc1_16_i1.c: Regenerated. + * generated/generated/minloc1_16_i2.c: Regenerated. + * generated/generated/minloc1_16_i4.c: Regenerated. + * generated/generated/minloc1_16_i8.c: Regenerated. + * generated/generated/minloc1_16_r10.c: Regenerated. + * generated/generated/minloc1_16_r16.c: Regenerated. + * generated/generated/minloc1_16_r4.c: Regenerated. + * generated/generated/minloc1_16_r8.c: Regenerated. + * generated/generated/minloc1_4_i16.c: Regenerated. + * generated/generated/minloc1_4_i1.c: Regenerated. + * generated/generated/minloc1_4_i2.c: Regenerated. + * generated/generated/minloc1_4_i4.c: Regenerated. + * generated/generated/minloc1_4_i8.c: Regenerated. + * generated/generated/minloc1_4_r10.c: Regenerated. + * generated/generated/minloc1_4_r16.c: Regenerated. + * generated/generated/minloc1_4_r4.c: Regenerated. + * generated/generated/minloc1_4_r8.c: Regenerated. + * generated/generated/minloc1_8_i16.c: Regenerated. + * generated/generated/minloc1_8_i1.c: Regenerated. + * generated/generated/minloc1_8_i2.c: Regenerated. + * generated/generated/minloc1_8_i4.c: Regenerated. + * generated/generated/minloc1_8_i8.c: Regenerated. + * generated/generated/minloc1_8_r10.c: Regenerated. + * generated/generated/minloc1_8_r16.c: Regenerated. + * generated/generated/minloc1_8_r4.c: Regenerated. + * generated/generated/minloc1_8_r8.c: Regenerated. + * generated/generated/minval_i16.c: Regenerated. + * generated/generated/minval_i1.c: Regenerated. + * generated/generated/minval_i2.c: Regenerated. + * generated/generated/minval_i4.c: Regenerated. + * generated/generated/minval_i8.c: Regenerated. + * generated/generated/minval_r10.c: Regenerated. + * generated/generated/minval_r16.c: Regenerated. + * generated/generated/minval_r4.c: Regenerated. + * generated/generated/minval_r8.c: Regenerated. + * generated/generated/product_c10.c: Regenerated. + * generated/generated/product_c16.c: Regenerated. + * generated/generated/product_c4.c: Regenerated. + * generated/generated/product_c8.c: Regenerated. + * generated/generated/product_i16.c: Regenerated. + * generated/generated/product_i1.c: Regenerated. + * generated/generated/product_i2.c: Regenerated. + * generated/generated/product_i4.c: Regenerated. + * generated/generated/product_i8.c: Regenerated. + * generated/generated/product_r10.c: Regenerated. + * generated/generated/product_r16.c: Regenerated. + * generated/generated/product_r4.c: Regenerated. + * generated/generated/product_r8.c: Regenerated. + * generated/generated/sum_c10.c: Regenerated. + * generated/generated/sum_c16.c: Regenerated. + * generated/generated/sum_c4.c: Regenerated. + * generated/generated/sum_c8.c: Regenerated. + * generated/generated/sum_i16.c: Regenerated. + * generated/generated/sum_i1.c: Regenerated. + * generated/generated/sum_i2.c: Regenerated. + * generated/generated/sum_i4.c: Regenerated. + * generated/generated/sum_i8.c: Regenerated. + * generated/generated/sum_r10.c: Regenerated. + * generated/generated/sum_r16.c: Regenerated. + * generated/generated/sum_r4.c: Regenerated. + * generated/generated/sum_r8.c: Regenerated. + 2011-09-01 Thomas Koenig <tkoenig@gcc.gnu.org> * generated/bessel_r4.c: Regenerated. diff --git a/libgfortran/generated/maxloc1_16_i1.c b/libgfortran/generated/maxloc1_16_i1.c index 920ea836b74..3e424631153 100644 --- a/libgfortran/generated/maxloc1_16_i1.c +++ b/libgfortran/generated/maxloc1_16_i1.c @@ -101,6 +101,7 @@ maxloc1_16_i1 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_i1 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_i16.c b/libgfortran/generated/maxloc1_16_i16.c index 0da1cc42f85..d6819aa713e 100644 --- a/libgfortran/generated/maxloc1_16_i16.c +++ b/libgfortran/generated/maxloc1_16_i16.c @@ -101,6 +101,7 @@ maxloc1_16_i16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_i16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_i2.c b/libgfortran/generated/maxloc1_16_i2.c index 08d2dc19a5d..691d034866a 100644 --- a/libgfortran/generated/maxloc1_16_i2.c +++ b/libgfortran/generated/maxloc1_16_i2.c @@ -101,6 +101,7 @@ maxloc1_16_i2 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_i2 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_i4.c b/libgfortran/generated/maxloc1_16_i4.c index 4b8a19ef21d..1e5b87cab3b 100644 --- a/libgfortran/generated/maxloc1_16_i4.c +++ b/libgfortran/generated/maxloc1_16_i4.c @@ -101,6 +101,7 @@ maxloc1_16_i4 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_i4 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_i8.c b/libgfortran/generated/maxloc1_16_i8.c index 292dad31693..c6a73d8335f 100644 --- a/libgfortran/generated/maxloc1_16_i8.c +++ b/libgfortran/generated/maxloc1_16_i8.c @@ -101,6 +101,7 @@ maxloc1_16_i8 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_i8 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_r10.c b/libgfortran/generated/maxloc1_16_r10.c index 090e9a9d409..d954000c8ee 100644 --- a/libgfortran/generated/maxloc1_16_r10.c +++ b/libgfortran/generated/maxloc1_16_r10.c @@ -101,6 +101,7 @@ maxloc1_16_r10 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_r10 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_r16.c b/libgfortran/generated/maxloc1_16_r16.c index a8fe92c85c3..4ecb78418c1 100644 --- a/libgfortran/generated/maxloc1_16_r16.c +++ b/libgfortran/generated/maxloc1_16_r16.c @@ -101,6 +101,7 @@ maxloc1_16_r16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_r16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_r4.c b/libgfortran/generated/maxloc1_16_r4.c index 5c80034a186..e5cd29156f3 100644 --- a/libgfortran/generated/maxloc1_16_r4.c +++ b/libgfortran/generated/maxloc1_16_r4.c @@ -101,6 +101,7 @@ maxloc1_16_r4 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_r4 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_16_r8.c b/libgfortran/generated/maxloc1_16_r8.c index 3f9200ecd0a..2d209d78691 100644 --- a/libgfortran/generated/maxloc1_16_r8.c +++ b/libgfortran/generated/maxloc1_16_r8.c @@ -101,6 +101,7 @@ maxloc1_16_r8 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_16_r8 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_i1.c b/libgfortran/generated/maxloc1_4_i1.c index 90f529ac812..efd6958072e 100644 --- a/libgfortran/generated/maxloc1_4_i1.c +++ b/libgfortran/generated/maxloc1_4_i1.c @@ -101,6 +101,7 @@ maxloc1_4_i1 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_i1 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_i16.c b/libgfortran/generated/maxloc1_4_i16.c index 1b4f3377535..71850fcf8a6 100644 --- a/libgfortran/generated/maxloc1_4_i16.c +++ b/libgfortran/generated/maxloc1_4_i16.c @@ -101,6 +101,7 @@ maxloc1_4_i16 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_i16 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_i2.c b/libgfortran/generated/maxloc1_4_i2.c index 3898b6f3855..d825039e8d5 100644 --- a/libgfortran/generated/maxloc1_4_i2.c +++ b/libgfortran/generated/maxloc1_4_i2.c @@ -101,6 +101,7 @@ maxloc1_4_i2 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_i2 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_i4.c b/libgfortran/generated/maxloc1_4_i4.c index 5fcb7545220..f70b5aa10be 100644 --- a/libgfortran/generated/maxloc1_4_i4.c +++ b/libgfortran/generated/maxloc1_4_i4.c @@ -101,6 +101,7 @@ maxloc1_4_i4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_i4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_i8.c b/libgfortran/generated/maxloc1_4_i8.c index b3b1caa1134..cda4a99ca75 100644 --- a/libgfortran/generated/maxloc1_4_i8.c +++ b/libgfortran/generated/maxloc1_4_i8.c @@ -101,6 +101,7 @@ maxloc1_4_i8 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_i8 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_r10.c b/libgfortran/generated/maxloc1_4_r10.c index 7e94e7b45bc..7901a4b15dd 100644 --- a/libgfortran/generated/maxloc1_4_r10.c +++ b/libgfortran/generated/maxloc1_4_r10.c @@ -101,6 +101,7 @@ maxloc1_4_r10 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_r10 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_r16.c b/libgfortran/generated/maxloc1_4_r16.c index 2793b6abcc6..f06d7b2bb2e 100644 --- a/libgfortran/generated/maxloc1_4_r16.c +++ b/libgfortran/generated/maxloc1_4_r16.c @@ -101,6 +101,7 @@ maxloc1_4_r16 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_r16 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_r4.c b/libgfortran/generated/maxloc1_4_r4.c index 5292711e50b..e6837aa61ff 100644 --- a/libgfortran/generated/maxloc1_4_r4.c +++ b/libgfortran/generated/maxloc1_4_r4.c @@ -101,6 +101,7 @@ maxloc1_4_r4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_r4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_4_r8.c b/libgfortran/generated/maxloc1_4_r8.c index 312e5d0b8ca..26c10c7b937 100644 --- a/libgfortran/generated/maxloc1_4_r8.c +++ b/libgfortran/generated/maxloc1_4_r8.c @@ -101,6 +101,7 @@ maxloc1_4_r8 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_4_r8 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_i1.c b/libgfortran/generated/maxloc1_8_i1.c index 6e63c7eb61b..c9dc6102056 100644 --- a/libgfortran/generated/maxloc1_8_i1.c +++ b/libgfortran/generated/maxloc1_8_i1.c @@ -101,6 +101,7 @@ maxloc1_8_i1 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_i1 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_i16.c b/libgfortran/generated/maxloc1_8_i16.c index ea1fa93678e..7cd62ac3a90 100644 --- a/libgfortran/generated/maxloc1_8_i16.c +++ b/libgfortran/generated/maxloc1_8_i16.c @@ -101,6 +101,7 @@ maxloc1_8_i16 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_i16 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_i2.c b/libgfortran/generated/maxloc1_8_i2.c index 21362a9d4af..fd0cc217248 100644 --- a/libgfortran/generated/maxloc1_8_i2.c +++ b/libgfortran/generated/maxloc1_8_i2.c @@ -101,6 +101,7 @@ maxloc1_8_i2 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_i2 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_i4.c b/libgfortran/generated/maxloc1_8_i4.c index e0245e3f9b2..97cd54bb550 100644 --- a/libgfortran/generated/maxloc1_8_i4.c +++ b/libgfortran/generated/maxloc1_8_i4.c @@ -101,6 +101,7 @@ maxloc1_8_i4 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_i4 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_i8.c b/libgfortran/generated/maxloc1_8_i8.c index c5312c0a12f..f9c455cb030 100644 --- a/libgfortran/generated/maxloc1_8_i8.c +++ b/libgfortran/generated/maxloc1_8_i8.c @@ -101,6 +101,7 @@ maxloc1_8_i8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_i8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_r10.c b/libgfortran/generated/maxloc1_8_r10.c index 6459ecffc7a..ab1173c6c37 100644 --- a/libgfortran/generated/maxloc1_8_r10.c +++ b/libgfortran/generated/maxloc1_8_r10.c @@ -101,6 +101,7 @@ maxloc1_8_r10 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_r10 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_r16.c b/libgfortran/generated/maxloc1_8_r16.c index 62b9ddbdac8..9a02e1273ba 100644 --- a/libgfortran/generated/maxloc1_8_r16.c +++ b/libgfortran/generated/maxloc1_8_r16.c @@ -101,6 +101,7 @@ maxloc1_8_r16 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_r16 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_r4.c b/libgfortran/generated/maxloc1_8_r4.c index 97ef902d9e4..584bdb81f54 100644 --- a/libgfortran/generated/maxloc1_8_r4.c +++ b/libgfortran/generated/maxloc1_8_r4.c @@ -101,6 +101,7 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_r4 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxloc1_8_r8.c b/libgfortran/generated/maxloc1_8_r8.c index e8cb0678f25..c6f3efd7054 100644 --- a/libgfortran/generated/maxloc1_8_r8.c +++ b/libgfortran/generated/maxloc1_8_r8.c @@ -101,6 +101,7 @@ maxloc1_8_r8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ maxloc1_8_r8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_i1.c b/libgfortran/generated/maxval_i1.c index ca6222bd63f..5b676827d44 100644 --- a/libgfortran/generated/maxval_i1.c +++ b/libgfortran/generated/maxval_i1.c @@ -100,6 +100,7 @@ maxval_i1 (gfc_array_i1 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_i1 (gfc_array_i1 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_i16.c b/libgfortran/generated/maxval_i16.c index 56580b64d8f..148319d6210 100644 --- a/libgfortran/generated/maxval_i16.c +++ b/libgfortran/generated/maxval_i16.c @@ -100,6 +100,7 @@ maxval_i16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_i16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_i2.c b/libgfortran/generated/maxval_i2.c index 7d39b2f9bf8..f87f3edf3ea 100644 --- a/libgfortran/generated/maxval_i2.c +++ b/libgfortran/generated/maxval_i2.c @@ -100,6 +100,7 @@ maxval_i2 (gfc_array_i2 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_i2 (gfc_array_i2 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_i4.c b/libgfortran/generated/maxval_i4.c index 0acb6b3e3d7..51f2511b4cc 100644 --- a/libgfortran/generated/maxval_i4.c +++ b/libgfortran/generated/maxval_i4.c @@ -100,6 +100,7 @@ maxval_i4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_i4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_i8.c b/libgfortran/generated/maxval_i8.c index 803a79f38d9..74aca03cf1b 100644 --- a/libgfortran/generated/maxval_i8.c +++ b/libgfortran/generated/maxval_i8.c @@ -100,6 +100,7 @@ maxval_i8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_i8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_r10.c b/libgfortran/generated/maxval_r10.c index 6eb3ea76ed1..3eaaa4c475c 100644 --- a/libgfortran/generated/maxval_r10.c +++ b/libgfortran/generated/maxval_r10.c @@ -100,6 +100,7 @@ maxval_r10 (gfc_array_r10 * const restrict retarray, alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_r10 (gfc_array_r10 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_r16.c b/libgfortran/generated/maxval_r16.c index 32387f4e3c5..bc4cf27bb37 100644 --- a/libgfortran/generated/maxval_r16.c +++ b/libgfortran/generated/maxval_r16.c @@ -100,6 +100,7 @@ maxval_r16 (gfc_array_r16 * const restrict retarray, alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_r16 (gfc_array_r16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_r4.c b/libgfortran/generated/maxval_r4.c index c4fe4df3631..d7e25ee7a9d 100644 --- a/libgfortran/generated/maxval_r4.c +++ b/libgfortran/generated/maxval_r4.c @@ -100,6 +100,7 @@ maxval_r4 (gfc_array_r4 * const restrict retarray, alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_r4 (gfc_array_r4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/maxval_r8.c b/libgfortran/generated/maxval_r8.c index bffc2b7681e..21c08e9ef1a 100644 --- a/libgfortran/generated/maxval_r8.c +++ b/libgfortran/generated/maxval_r8.c @@ -100,6 +100,7 @@ maxval_r8 (gfc_array_r8 * const restrict retarray, alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ maxval_r8 (gfc_array_r8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_i1.c b/libgfortran/generated/minloc1_16_i1.c index 2cdfd0f5842..8b4b53f81a7 100644 --- a/libgfortran/generated/minloc1_16_i1.c +++ b/libgfortran/generated/minloc1_16_i1.c @@ -101,6 +101,7 @@ minloc1_16_i1 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_i1 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_i16.c b/libgfortran/generated/minloc1_16_i16.c index 9e4f82a5fd9..3a18e8c3672 100644 --- a/libgfortran/generated/minloc1_16_i16.c +++ b/libgfortran/generated/minloc1_16_i16.c @@ -101,6 +101,7 @@ minloc1_16_i16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_i16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_i2.c b/libgfortran/generated/minloc1_16_i2.c index 5d55ed01f7d..bc13bee9eda 100644 --- a/libgfortran/generated/minloc1_16_i2.c +++ b/libgfortran/generated/minloc1_16_i2.c @@ -101,6 +101,7 @@ minloc1_16_i2 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_i2 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_i4.c b/libgfortran/generated/minloc1_16_i4.c index 3ee75aecd60..84d131a7aec 100644 --- a/libgfortran/generated/minloc1_16_i4.c +++ b/libgfortran/generated/minloc1_16_i4.c @@ -101,6 +101,7 @@ minloc1_16_i4 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_i4 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_i8.c b/libgfortran/generated/minloc1_16_i8.c index 847aa5184b8..1f3e0549da1 100644 --- a/libgfortran/generated/minloc1_16_i8.c +++ b/libgfortran/generated/minloc1_16_i8.c @@ -101,6 +101,7 @@ minloc1_16_i8 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_i8 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_r10.c b/libgfortran/generated/minloc1_16_r10.c index cf6f7cf517d..6bda151ae4c 100644 --- a/libgfortran/generated/minloc1_16_r10.c +++ b/libgfortran/generated/minloc1_16_r10.c @@ -101,6 +101,7 @@ minloc1_16_r10 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_r10 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_r16.c b/libgfortran/generated/minloc1_16_r16.c index ebe6c6dd4a4..c31cf4bcbbd 100644 --- a/libgfortran/generated/minloc1_16_r16.c +++ b/libgfortran/generated/minloc1_16_r16.c @@ -101,6 +101,7 @@ minloc1_16_r16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_r16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_r4.c b/libgfortran/generated/minloc1_16_r4.c index 7b335a93573..52ec2b078cf 100644 --- a/libgfortran/generated/minloc1_16_r4.c +++ b/libgfortran/generated/minloc1_16_r4.c @@ -101,6 +101,7 @@ minloc1_16_r4 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_r4 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_16_r8.c b/libgfortran/generated/minloc1_16_r8.c index a410a278387..a53ed3452ce 100644 --- a/libgfortran/generated/minloc1_16_r8.c +++ b/libgfortran/generated/minloc1_16_r8.c @@ -101,6 +101,7 @@ minloc1_16_r8 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_16_r8 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_i1.c b/libgfortran/generated/minloc1_4_i1.c index 21448ac187c..e8af3612742 100644 --- a/libgfortran/generated/minloc1_4_i1.c +++ b/libgfortran/generated/minloc1_4_i1.c @@ -101,6 +101,7 @@ minloc1_4_i1 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_i1 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_i16.c b/libgfortran/generated/minloc1_4_i16.c index 7851ba8a579..8d3da2059d1 100644 --- a/libgfortran/generated/minloc1_4_i16.c +++ b/libgfortran/generated/minloc1_4_i16.c @@ -101,6 +101,7 @@ minloc1_4_i16 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_i16 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_i2.c b/libgfortran/generated/minloc1_4_i2.c index 265472dbd2a..e7f24491f5f 100644 --- a/libgfortran/generated/minloc1_4_i2.c +++ b/libgfortran/generated/minloc1_4_i2.c @@ -101,6 +101,7 @@ minloc1_4_i2 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_i2 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_i4.c b/libgfortran/generated/minloc1_4_i4.c index 794f25e7f06..94d45c92d66 100644 --- a/libgfortran/generated/minloc1_4_i4.c +++ b/libgfortran/generated/minloc1_4_i4.c @@ -101,6 +101,7 @@ minloc1_4_i4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_i4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_i8.c b/libgfortran/generated/minloc1_4_i8.c index 05e4a6540ef..fa07bcb8789 100644 --- a/libgfortran/generated/minloc1_4_i8.c +++ b/libgfortran/generated/minloc1_4_i8.c @@ -101,6 +101,7 @@ minloc1_4_i8 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_i8 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_r10.c b/libgfortran/generated/minloc1_4_r10.c index 8f5018f012e..5cb23a6b694 100644 --- a/libgfortran/generated/minloc1_4_r10.c +++ b/libgfortran/generated/minloc1_4_r10.c @@ -101,6 +101,7 @@ minloc1_4_r10 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_r10 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_r16.c b/libgfortran/generated/minloc1_4_r16.c index 42f428a49f7..40854a12b8b 100644 --- a/libgfortran/generated/minloc1_4_r16.c +++ b/libgfortran/generated/minloc1_4_r16.c @@ -101,6 +101,7 @@ minloc1_4_r16 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_r16 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_r4.c b/libgfortran/generated/minloc1_4_r4.c index d05ac79fb1b..4231d180d5d 100644 --- a/libgfortran/generated/minloc1_4_r4.c +++ b/libgfortran/generated/minloc1_4_r4.c @@ -101,6 +101,7 @@ minloc1_4_r4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_r4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_4_r8.c b/libgfortran/generated/minloc1_4_r8.c index 372e592daab..8e5e5ddc41b 100644 --- a/libgfortran/generated/minloc1_4_r8.c +++ b/libgfortran/generated/minloc1_4_r8.c @@ -101,6 +101,7 @@ minloc1_4_r8 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_4_r8 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_i1.c b/libgfortran/generated/minloc1_8_i1.c index c71191f17f4..9a54335c8e2 100644 --- a/libgfortran/generated/minloc1_8_i1.c +++ b/libgfortran/generated/minloc1_8_i1.c @@ -101,6 +101,7 @@ minloc1_8_i1 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_i1 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_i16.c b/libgfortran/generated/minloc1_8_i16.c index 1939ab3582f..f0b477ebd83 100644 --- a/libgfortran/generated/minloc1_8_i16.c +++ b/libgfortran/generated/minloc1_8_i16.c @@ -101,6 +101,7 @@ minloc1_8_i16 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_i16 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_i2.c b/libgfortran/generated/minloc1_8_i2.c index d869537e668..9d3d14ee5c9 100644 --- a/libgfortran/generated/minloc1_8_i2.c +++ b/libgfortran/generated/minloc1_8_i2.c @@ -101,6 +101,7 @@ minloc1_8_i2 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_i2 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_i4.c b/libgfortran/generated/minloc1_8_i4.c index 2ee384f24e3..edac05ccd58 100644 --- a/libgfortran/generated/minloc1_8_i4.c +++ b/libgfortran/generated/minloc1_8_i4.c @@ -101,6 +101,7 @@ minloc1_8_i4 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_i4 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_i8.c b/libgfortran/generated/minloc1_8_i8.c index ae164cf8e42..3c0f44127ca 100644 --- a/libgfortran/generated/minloc1_8_i8.c +++ b/libgfortran/generated/minloc1_8_i8.c @@ -101,6 +101,7 @@ minloc1_8_i8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_i8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_r10.c b/libgfortran/generated/minloc1_8_r10.c index 383cb884b1a..a9239d28cbd 100644 --- a/libgfortran/generated/minloc1_8_r10.c +++ b/libgfortran/generated/minloc1_8_r10.c @@ -101,6 +101,7 @@ minloc1_8_r10 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_r10 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_r16.c b/libgfortran/generated/minloc1_8_r16.c index 3f4d4702c73..953ada7ef98 100644 --- a/libgfortran/generated/minloc1_8_r16.c +++ b/libgfortran/generated/minloc1_8_r16.c @@ -101,6 +101,7 @@ minloc1_8_r16 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_r16 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_r4.c b/libgfortran/generated/minloc1_8_r4.c index f72cbb2ca05..3882000168b 100644 --- a/libgfortran/generated/minloc1_8_r4.c +++ b/libgfortran/generated/minloc1_8_r4.c @@ -101,6 +101,7 @@ minloc1_8_r4 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_r4 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minloc1_8_r8.c b/libgfortran/generated/minloc1_8_r8.c index 1ed4486c623..c8d181277da 100644 --- a/libgfortran/generated/minloc1_8_r8.c +++ b/libgfortran/generated/minloc1_8_r8.c @@ -101,6 +101,7 @@ minloc1_8_r8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -108,8 +109,6 @@ minloc1_8_r8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_i1.c b/libgfortran/generated/minval_i1.c index 9b15d0f3f2b..d9ee1d75465 100644 --- a/libgfortran/generated/minval_i1.c +++ b/libgfortran/generated/minval_i1.c @@ -100,6 +100,7 @@ minval_i1 (gfc_array_i1 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_i1 (gfc_array_i1 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_i16.c b/libgfortran/generated/minval_i16.c index 1aea301427c..8394547568d 100644 --- a/libgfortran/generated/minval_i16.c +++ b/libgfortran/generated/minval_i16.c @@ -100,6 +100,7 @@ minval_i16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_i16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_i2.c b/libgfortran/generated/minval_i2.c index 3de9f023b5b..9cffe844d80 100644 --- a/libgfortran/generated/minval_i2.c +++ b/libgfortran/generated/minval_i2.c @@ -100,6 +100,7 @@ minval_i2 (gfc_array_i2 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_i2 (gfc_array_i2 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_i4.c b/libgfortran/generated/minval_i4.c index 3023bc214a1..993116a8345 100644 --- a/libgfortran/generated/minval_i4.c +++ b/libgfortran/generated/minval_i4.c @@ -100,6 +100,7 @@ minval_i4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_i4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_i8.c b/libgfortran/generated/minval_i8.c index 32fb133ce1b..3a52b4b7e21 100644 --- a/libgfortran/generated/minval_i8.c +++ b/libgfortran/generated/minval_i8.c @@ -100,6 +100,7 @@ minval_i8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_i8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_r10.c b/libgfortran/generated/minval_r10.c index 033288d94df..b490b3beec0 100644 --- a/libgfortran/generated/minval_r10.c +++ b/libgfortran/generated/minval_r10.c @@ -100,6 +100,7 @@ minval_r10 (gfc_array_r10 * const restrict retarray, alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_r10 (gfc_array_r10 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_r16.c b/libgfortran/generated/minval_r16.c index 35d2bac110d..701191f4041 100644 --- a/libgfortran/generated/minval_r16.c +++ b/libgfortran/generated/minval_r16.c @@ -100,6 +100,7 @@ minval_r16 (gfc_array_r16 * const restrict retarray, alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_r16 (gfc_array_r16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_r4.c b/libgfortran/generated/minval_r4.c index 61502b0c2ae..e69376590aa 100644 --- a/libgfortran/generated/minval_r4.c +++ b/libgfortran/generated/minval_r4.c @@ -100,6 +100,7 @@ minval_r4 (gfc_array_r4 * const restrict retarray, alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_r4 (gfc_array_r4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/minval_r8.c b/libgfortran/generated/minval_r8.c index 8884d93b9b8..611ee57968c 100644 --- a/libgfortran/generated/minval_r8.c +++ b/libgfortran/generated/minval_r8.c @@ -100,6 +100,7 @@ minval_r8 (gfc_array_r8 * const restrict retarray, alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ minval_r8 (gfc_array_r8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_c10.c b/libgfortran/generated/product_c10.c index 4aa057de4e7..140aa305f66 100644 --- a/libgfortran/generated/product_c10.c +++ b/libgfortran/generated/product_c10.c @@ -100,6 +100,7 @@ product_c10 (gfc_array_c10 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_c10 (gfc_array_c10 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_c16.c b/libgfortran/generated/product_c16.c index aa69fa86fbf..d59510248b5 100644 --- a/libgfortran/generated/product_c16.c +++ b/libgfortran/generated/product_c16.c @@ -100,6 +100,7 @@ product_c16 (gfc_array_c16 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_c16 (gfc_array_c16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_c4.c b/libgfortran/generated/product_c4.c index 145f41f336d..34c1bde263e 100644 --- a/libgfortran/generated/product_c4.c +++ b/libgfortran/generated/product_c4.c @@ -100,6 +100,7 @@ product_c4 (gfc_array_c4 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_c4 (gfc_array_c4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_c8.c b/libgfortran/generated/product_c8.c index 7c16b6425f4..6e3487489e8 100644 --- a/libgfortran/generated/product_c8.c +++ b/libgfortran/generated/product_c8.c @@ -100,6 +100,7 @@ product_c8 (gfc_array_c8 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_c8 (gfc_array_c8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_i1.c b/libgfortran/generated/product_i1.c index e087a0621f0..2e042871889 100644 --- a/libgfortran/generated/product_i1.c +++ b/libgfortran/generated/product_i1.c @@ -100,6 +100,7 @@ product_i1 (gfc_array_i1 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_i1 (gfc_array_i1 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_i16.c b/libgfortran/generated/product_i16.c index 9d224f39f9f..e487ddfeda6 100644 --- a/libgfortran/generated/product_i16.c +++ b/libgfortran/generated/product_i16.c @@ -100,6 +100,7 @@ product_i16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_i16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_i2.c b/libgfortran/generated/product_i2.c index f025729fe84..b4b0a4ce736 100644 --- a/libgfortran/generated/product_i2.c +++ b/libgfortran/generated/product_i2.c @@ -100,6 +100,7 @@ product_i2 (gfc_array_i2 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_i2 (gfc_array_i2 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_i4.c b/libgfortran/generated/product_i4.c index 3452923b06a..a0164a1615b 100644 --- a/libgfortran/generated/product_i4.c +++ b/libgfortran/generated/product_i4.c @@ -100,6 +100,7 @@ product_i4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_i4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_i8.c b/libgfortran/generated/product_i8.c index 44b0163ca87..64c648774a9 100644 --- a/libgfortran/generated/product_i8.c +++ b/libgfortran/generated/product_i8.c @@ -100,6 +100,7 @@ product_i8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_i8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_r10.c b/libgfortran/generated/product_r10.c index b93929d95db..71a70da966f 100644 --- a/libgfortran/generated/product_r10.c +++ b/libgfortran/generated/product_r10.c @@ -100,6 +100,7 @@ product_r10 (gfc_array_r10 * const restrict retarray, alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_r10 (gfc_array_r10 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_r16.c b/libgfortran/generated/product_r16.c index 6348cc50e1d..0028ba1f861 100644 --- a/libgfortran/generated/product_r16.c +++ b/libgfortran/generated/product_r16.c @@ -100,6 +100,7 @@ product_r16 (gfc_array_r16 * const restrict retarray, alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_r16 (gfc_array_r16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_r4.c b/libgfortran/generated/product_r4.c index a1c0b521be5..492980e6769 100644 --- a/libgfortran/generated/product_r4.c +++ b/libgfortran/generated/product_r4.c @@ -100,6 +100,7 @@ product_r4 (gfc_array_r4 * const restrict retarray, alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_r4 (gfc_array_r4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/product_r8.c b/libgfortran/generated/product_r8.c index b56fcfb23e4..cf05af1faaf 100644 --- a/libgfortran/generated/product_r8.c +++ b/libgfortran/generated/product_r8.c @@ -100,6 +100,7 @@ product_r8 (gfc_array_r8 * const restrict retarray, alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ product_r8 (gfc_array_r8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_c10.c b/libgfortran/generated/sum_c10.c index ae654dc9aae..b982bfea04a 100644 --- a/libgfortran/generated/sum_c10.c +++ b/libgfortran/generated/sum_c10.c @@ -100,6 +100,7 @@ sum_c10 (gfc_array_c10 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_c10 (gfc_array_c10 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_c16.c b/libgfortran/generated/sum_c16.c index 7829b5594f7..0bf2b69d79d 100644 --- a/libgfortran/generated/sum_c16.c +++ b/libgfortran/generated/sum_c16.c @@ -100,6 +100,7 @@ sum_c16 (gfc_array_c16 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_c16 (gfc_array_c16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_c4.c b/libgfortran/generated/sum_c4.c index 76f67afab26..a34e63cdd89 100644 --- a/libgfortran/generated/sum_c4.c +++ b/libgfortran/generated/sum_c4.c @@ -100,6 +100,7 @@ sum_c4 (gfc_array_c4 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_c4 (gfc_array_c4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_c8.c b/libgfortran/generated/sum_c8.c index 4673357e61f..42dea7b2810 100644 --- a/libgfortran/generated/sum_c8.c +++ b/libgfortran/generated/sum_c8.c @@ -100,6 +100,7 @@ sum_c8 (gfc_array_c8 * const restrict retarray, alloc_size = sizeof (GFC_COMPLEX_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_c8 (gfc_array_c8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_i1.c b/libgfortran/generated/sum_i1.c index e661f5e876a..4eb6d642008 100644 --- a/libgfortran/generated/sum_i1.c +++ b/libgfortran/generated/sum_i1.c @@ -100,6 +100,7 @@ sum_i1 (gfc_array_i1 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_1) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_i1 (gfc_array_i1 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_i16.c b/libgfortran/generated/sum_i16.c index cff59c01c47..8e2c7b3aeb7 100644 --- a/libgfortran/generated/sum_i16.c +++ b/libgfortran/generated/sum_i16.c @@ -100,6 +100,7 @@ sum_i16 (gfc_array_i16 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_i16 (gfc_array_i16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_i2.c b/libgfortran/generated/sum_i2.c index 1cf463e36f9..12ef64d3523 100644 --- a/libgfortran/generated/sum_i2.c +++ b/libgfortran/generated/sum_i2.c @@ -100,6 +100,7 @@ sum_i2 (gfc_array_i2 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_i2 (gfc_array_i2 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_i4.c b/libgfortran/generated/sum_i4.c index 4c86b524034..645ef436bff 100644 --- a/libgfortran/generated/sum_i4.c +++ b/libgfortran/generated/sum_i4.c @@ -100,6 +100,7 @@ sum_i4 (gfc_array_i4 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_i4 (gfc_array_i4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_i8.c b/libgfortran/generated/sum_i8.c index 4b360242e07..adb29b51c73 100644 --- a/libgfortran/generated/sum_i8.c +++ b/libgfortran/generated/sum_i8.c @@ -100,6 +100,7 @@ sum_i8 (gfc_array_i8 * const restrict retarray, alloc_size = sizeof (GFC_INTEGER_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_i8 (gfc_array_i8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_r10.c b/libgfortran/generated/sum_r10.c index 7df3ef9a523..9f588a5da51 100644 --- a/libgfortran/generated/sum_r10.c +++ b/libgfortran/generated/sum_r10.c @@ -100,6 +100,7 @@ sum_r10 (gfc_array_r10 * const restrict retarray, alloc_size = sizeof (GFC_REAL_10) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_r10 (gfc_array_r10 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_r16.c b/libgfortran/generated/sum_r16.c index ce0183b6dbc..292e66f7117 100644 --- a/libgfortran/generated/sum_r16.c +++ b/libgfortran/generated/sum_r16.c @@ -100,6 +100,7 @@ sum_r16 (gfc_array_r16 * const restrict retarray, alloc_size = sizeof (GFC_REAL_16) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_r16 (gfc_array_r16 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_r4.c b/libgfortran/generated/sum_r4.c index ab9335f9bd3..8fd563fc9d5 100644 --- a/libgfortran/generated/sum_r4.c +++ b/libgfortran/generated/sum_r4.c @@ -100,6 +100,7 @@ sum_r4 (gfc_array_r4 * const restrict retarray, alloc_size = sizeof (GFC_REAL_4) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_r4 (gfc_array_r4 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/generated/sum_r8.c b/libgfortran/generated/sum_r8.c index d10a86ebd0e..e5839806054 100644 --- a/libgfortran/generated/sum_r8.c +++ b/libgfortran/generated/sum_r8.c @@ -100,6 +100,7 @@ sum_r8 (gfc_array_r8 * const restrict retarray, alloc_size = sizeof (GFC_REAL_8) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -107,8 +108,6 @@ sum_r8 (gfc_array_r8 * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4 index 72b05f45e96..68e1c5e18a3 100644 --- a/libgfortran/m4/ifunction.m4 +++ b/libgfortran/m4/ifunction.m4 @@ -88,6 +88,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, alloc_size = sizeof (rtype_name) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -95,8 +96,6 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray, return; } - else - retarray->data = internal_malloc_size (alloc_size); } else { |