From: Thomas Koenig Date: Sat, 10 Sep 2011 14:06:57 +0000 (+0000) Subject: re PR fortran/49479 (reshape / optionals / zero sized arrays) X-Git-Tag: releases/gcc-4.7.0~3829 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95928a1322cc2f3382ae1aaeac946228ca513d72;p=thirdparty%2Fgcc.git re PR fortran/49479 (reshape / optionals / zero sized arrays) 2011-09-10 Thomas Koenig 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. From-SVN: r178748 --- diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 1ea792f92c61..4546c276dfae 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,107 @@ +2011-09-10 Thomas Koenig + + 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 * generated/bessel_r4.c: Regenerated. diff --git a/libgfortran/generated/maxloc1_16_i1.c b/libgfortran/generated/maxloc1_16_i1.c index 920ea836b745..3e4246311539 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 0da1cc42f85a..d6819aa713e4 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 08d2dc19a5d3..691d034866ab 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 4b8a19ef21d6..1e5b87cab3b2 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 292dad316936..c6a73d8335fa 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 090e9a9d4098..d954000c8eeb 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 a8fe92c85c38..4ecb78418c18 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 5c80034a1863..e5cd29156f3e 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 3f9200ecd0a1..2d209d786911 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 90f529ac812b..efd6958072ef 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 1b4f3377535e..71850fcf8a61 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 3898b6f3855a..d825039e8d51 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 5fcb75452209..f70b5aa10be9 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 b3b1caa1134a..cda4a99ca750 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 7e94e7b45bc0..7901a4b15ddc 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 2793b6abcc6e..f06d7b2bb2ee 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 5292711e50b4..e6837aa61ff0 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 312e5d0b8ca2..26c10c7b9374 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 6e63c7eb61b4..c9dc6102056a 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 ea1fa93678e9..7cd62ac3a909 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 21362a9d4af9..fd0cc2172481 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 e0245e3f9b26..97cd54bb550e 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 c5312c0a12ff..f9c455cb0305 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 6459ecffc7a8..ab1173c6c377 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 62b9ddbdac8f..9a02e1273bae 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 97ef902d9e48..584bdb81f543 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 e8cb0678f253..c6f3efd7054a 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 ca6222bd63f9..5b676827d440 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 56580b64d8f6..148319d6210c 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 7d39b2f9bf86..f87f3edf3eac 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 0acb6b3e3d7d..51f2511b4cc3 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 803a79f38d9a..74aca03cf1b2 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 6eb3ea76ed10..3eaaa4c475cd 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 32387f4e3c57..bc4cf27bb37c 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 c4fe4df3631e..d7e25ee7a9d5 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 bffc2b7681e0..21c08e9ef1ae 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 2cdfd0f5842a..8b4b53f81a7d 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 9e4f82a5fd9b..3a18e8c36720 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 5d55ed01f7d5..bc13bee9edab 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 3ee75aecd605..84d131a7aecb 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 847aa5184b88..1f3e0549da1b 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 cf6f7cf517d9..6bda151ae4c9 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 ebe6c6dd4a47..c31cf4bcbbd8 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 7b335a935737..52ec2b078cf1 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 a410a2783875..a53ed3452ce4 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 21448ac187c3..e8af36127422 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 7851ba8a5792..8d3da2059d14 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 265472dbd2ad..e7f24491f5f4 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 794f25e7f060..94d45c92d667 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 05e4a6540ef5..fa07bcb8789b 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 8f5018f012ee..5cb23a6b6949 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 42f428a49f7d..40854a12b8bf 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 d05ac79fb1b4..4231d180d5d2 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 372e592daabb..8e5e5ddc41b6 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 c71191f17f4d..9a54335c8e21 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 1939ab3582f4..f0b477ebd830 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 d869537e6681..9d3d14ee5c90 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 2ee384f24e34..edac05ccd587 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 ae164cf8e42c..3c0f44127cab 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 383cb884b1ad..a9239d28cbd9 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 3f4d4702c73c..953ada7ef98a 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 f72cbb2ca057..3882000168b2 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 1ed4486c6239..c8d181277dae 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 9b15d0f3f2b3..d9ee1d754653 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 1aea301427c3..8394547568d6 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 3de9f023b5b2..9cffe844d800 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 3023bc214a16..993116a83452 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 32fb133ce1b4..3a52b4b7e210 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 033288d94dfe..b490b3beec02 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 35d2bac110d9..701191f4041b 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 61502b0c2ae5..e69376590aaf 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 8884d93b9b8f..611ee57968c3 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 4aa057de4e7f..140aa305f66e 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 aa69fa86fbfe..d59510248b58 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 145f41f336d7..34c1bde263eb 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 7c16b6425f44..6e3487489e87 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 e087a0621f05..2e0428718898 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 9d224f39f9f3..e487ddfeda63 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 f025729fe845..b4b0a4ce7368 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 3452923b06a8..a0164a1615ba 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 44b0163ca876..64c648774a98 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 b93929d95dbe..71a70da966f5 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 6348cc50e1d1..0028ba1f8614 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 a1c0b521be57..492980e67697 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 b56fcfb23e42..cf05af1faaf3 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 ae654dc9aae8..b982bfea04af 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 7829b5594f7f..0bf2b69d79dd 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 76f67afab265..a34e63cdd89d 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 4673357e61f4..42dea7b2810a 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 e661f5e876a6..4eb6d642008a 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 cff59c01c472..8e2c7b3aeb7c 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 1cf463e36f99..12ef64d3523f 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 4c86b524034d..645ef436bffa 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 4b360242e072..adb29b51c739 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 7df3ef9a5234..9f588a5da51a 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 ce0183b6dbc6..292e66f71175 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 ab9335f9bd3f..8fd563fc9d5b 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 d10a86ebd0ef..e58398060544 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 72b05f45e969..68e1c5e18a37 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 {