2ea47ee9fd
2018-12-31 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/82995 * trans-expr.c (gfc_conv_procedure_call): Pass NULL pointer for missing optional dummy arguments for library routines. * trans-intinsic.c (conv_mask_condition): New function. (gfc_conv_intrinsic_arith): Detect and handle optional mask. (gfc_conv_intrinsic_minmaxloc): Likewise. (gfc_conv_intrinsic_findloc): Likewise. (gfc_conv_intrinsic_minmaxval): Likewise. (gfc_inline_intrinsic_function_p): Do not inline for rank > 1 if an optional mask is present. 2018-12-31 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/82995 * m4/ifindloc0.m4: Handle case of absend optional argument, passed as a NULL pointer. Correct allocation of retarray->base_addr. * m4/ifindloc1.m4: Likewise. * m4/ifindloc2.m4: Handle case of absend optional argument, passed as a NULL pointer. * m4/iforeach-s.m4: Likewise. * m4/iforeach-s2.m4: Likewise. * m4/iforeach.m4: Likewise. * m4/ifunction-s.m4: Likewise. * m4/ifunction-s2.m4: Likewise. * m4/ifunction.m4: Likewise. * generated/findloc0_c16.c: Regenerated. * generated/findloc0_c4.c: Regenerated. * generated/findloc0_c8.c: Regenerated. * generated/findloc0_i1.c: Regenerated. * generated/findloc0_i16.c: Regenerated. * generated/findloc0_i2.c: Regenerated. * generated/findloc0_i4.c: Regenerated. * generated/findloc0_i8.c: Regenerated. * generated/findloc0_r16.c: Regenerated. * generated/findloc0_r4.c: Regenerated. * generated/findloc0_r8.c: Regenerated. * generated/findloc0_s1.c: Regenerated. * generated/findloc0_s4.c: Regenerated. * generated/findloc1_c16.c: Regenerated. * generated/findloc1_c4.c: Regenerated. * generated/findloc1_c8.c: Regenerated. * generated/findloc1_i1.c: Regenerated. * generated/findloc1_i16.c: Regenerated. * generated/findloc1_i2.c: Regenerated. * generated/findloc1_i4.c: Regenerated. * generated/findloc1_i8.c: Regenerated. * generated/findloc1_r16.c: Regenerated. * generated/findloc1_r4.c: Regenerated. * generated/findloc1_r8.c: Regenerated. * generated/findloc1_s1.c: Regenerated. * generated/findloc1_s4.c: Regenerated. * generated/findloc2_s1.c: Regenerated. * generated/findloc2_s4.c: Regenerated. * generated/iall_i1.c: Regenerated. * generated/iall_i16.c: Regenerated. * generated/iall_i2.c: Regenerated. * generated/iall_i4.c: Regenerated. * generated/iall_i8.c: Regenerated. * generated/iany_i1.c: Regenerated. * generated/iany_i16.c: Regenerated. * generated/iany_i2.c: Regenerated. * generated/iany_i4.c: Regenerated. * generated/iany_i8.c: Regenerated. * generated/iparity_i1.c: Regenerated. * generated/iparity_i16.c: Regenerated. * generated/iparity_i2.c: Regenerated. * generated/iparity_i4.c: Regenerated. * generated/iparity_i8.c: Regenerated. * generated/maxloc0_16_i1.c: Regenerated. * generated/maxloc0_16_i16.c: Regenerated. * generated/maxloc0_16_i2.c: Regenerated. * generated/maxloc0_16_i4.c: Regenerated. * generated/maxloc0_16_i8.c: Regenerated. * generated/maxloc0_16_r10.c: Regenerated. * generated/maxloc0_16_r16.c: Regenerated. * generated/maxloc0_16_r4.c: Regenerated. * generated/maxloc0_16_r8.c: Regenerated. * generated/maxloc0_16_s1.c: Regenerated. * generated/maxloc0_16_s4.c: Regenerated. * generated/maxloc0_4_i1.c: Regenerated. * generated/maxloc0_4_i16.c: Regenerated. * generated/maxloc0_4_i2.c: Regenerated. * generated/maxloc0_4_i4.c: Regenerated. * generated/maxloc0_4_i8.c: Regenerated. * generated/maxloc0_4_r10.c: Regenerated. * generated/maxloc0_4_r16.c: Regenerated. * generated/maxloc0_4_r4.c: Regenerated. * generated/maxloc0_4_r8.c: Regenerated. * generated/maxloc0_4_s1.c: Regenerated. * generated/maxloc0_4_s4.c: Regenerated. * generated/maxloc0_8_i1.c: Regenerated. * generated/maxloc0_8_i16.c: Regenerated. * generated/maxloc0_8_i2.c: Regenerated. * generated/maxloc0_8_i4.c: Regenerated. * generated/maxloc0_8_i8.c: Regenerated. * generated/maxloc0_8_r10.c: Regenerated. * generated/maxloc0_8_r16.c: Regenerated. * generated/maxloc0_8_r4.c: Regenerated. * generated/maxloc0_8_r8.c: Regenerated. * generated/maxloc0_8_s1.c: Regenerated. * generated/maxloc0_8_s4.c: Regenerated. * generated/maxloc1_16_i1.c: Regenerated. * generated/maxloc1_16_i16.c: Regenerated. * generated/maxloc1_16_i2.c: Regenerated. * generated/maxloc1_16_i4.c: Regenerated. * generated/maxloc1_16_i8.c: Regenerated. * generated/maxloc1_16_r10.c: Regenerated. * generated/maxloc1_16_r16.c: Regenerated. * generated/maxloc1_16_r4.c: Regenerated. * generated/maxloc1_16_r8.c: Regenerated. * generated/maxloc1_16_s1.c: Regenerated. * generated/maxloc1_16_s4.c: Regenerated. * generated/maxloc1_4_i1.c: Regenerated. * generated/maxloc1_4_i16.c: Regenerated. * generated/maxloc1_4_i2.c: Regenerated. * generated/maxloc1_4_i4.c: Regenerated. * generated/maxloc1_4_i8.c: Regenerated. * generated/maxloc1_4_r10.c: Regenerated. * generated/maxloc1_4_r16.c: Regenerated. * generated/maxloc1_4_r4.c: Regenerated. * generated/maxloc1_4_r8.c: Regenerated. * generated/maxloc1_4_s1.c: Regenerated. * generated/maxloc1_4_s4.c: Regenerated. * generated/maxloc1_8_i1.c: Regenerated. * generated/maxloc1_8_i16.c: Regenerated. * generated/maxloc1_8_i2.c: Regenerated. * generated/maxloc1_8_i4.c: Regenerated. * generated/maxloc1_8_i8.c: Regenerated. * generated/maxloc1_8_r10.c: Regenerated. * generated/maxloc1_8_r16.c: Regenerated. * generated/maxloc1_8_r4.c: Regenerated. * generated/maxloc1_8_r8.c: Regenerated. * generated/maxloc1_8_s1.c: Regenerated. * generated/maxloc1_8_s4.c: Regenerated. * generated/maxval0_s1.c: Regenerated. * generated/maxval0_s4.c: Regenerated. * generated/maxval1_s1.c: Regenerated. * generated/maxval1_s4.c: Regenerated. * generated/maxval_i1.c: Regenerated. * generated/maxval_i16.c: Regenerated. * generated/maxval_i2.c: Regenerated. * generated/maxval_i4.c: Regenerated. * generated/maxval_i8.c: Regenerated. * generated/maxval_r10.c: Regenerated. * generated/maxval_r16.c: Regenerated. * generated/maxval_r4.c: Regenerated. * generated/maxval_r8.c: Regenerated. * generated/minloc0_16_i1.c: Regenerated. * generated/minloc0_16_i16.c: Regenerated. * generated/minloc0_16_i2.c: Regenerated. * generated/minloc0_16_i4.c: Regenerated. * generated/minloc0_16_i8.c: Regenerated. * generated/minloc0_16_r10.c: Regenerated. * generated/minloc0_16_r16.c: Regenerated. * generated/minloc0_16_r4.c: Regenerated. * generated/minloc0_16_r8.c: Regenerated. * generated/minloc0_16_s1.c: Regenerated. * generated/minloc0_16_s4.c: Regenerated. * generated/minloc0_4_i1.c: Regenerated. * generated/minloc0_4_i16.c: Regenerated. * generated/minloc0_4_i2.c: Regenerated. * generated/minloc0_4_i4.c: Regenerated. * generated/minloc0_4_i8.c: Regenerated. * generated/minloc0_4_r10.c: Regenerated. * generated/minloc0_4_r16.c: Regenerated. * generated/minloc0_4_r4.c: Regenerated. * generated/minloc0_4_r8.c: Regenerated. * generated/minloc0_4_s1.c: Regenerated. * generated/minloc0_4_s4.c: Regenerated. * generated/minloc0_8_i1.c: Regenerated. * generated/minloc0_8_i16.c: Regenerated. * generated/minloc0_8_i2.c: Regenerated. * generated/minloc0_8_i4.c: Regenerated. * generated/minloc0_8_i8.c: Regenerated. * generated/minloc0_8_r10.c: Regenerated. * generated/minloc0_8_r16.c: Regenerated. * generated/minloc0_8_r4.c: Regenerated. * generated/minloc0_8_r8.c: Regenerated. * generated/minloc0_8_s1.c: Regenerated. * generated/minloc0_8_s4.c: Regenerated. * generated/minloc1_16_i1.c: Regenerated. * generated/minloc1_16_i16.c: Regenerated. * generated/minloc1_16_i2.c: Regenerated. * generated/minloc1_16_i4.c: Regenerated. * generated/minloc1_16_i8.c: Regenerated. * generated/minloc1_16_r10.c: Regenerated. * generated/minloc1_16_r16.c: Regenerated. * generated/minloc1_16_r4.c: Regenerated. * generated/minloc1_16_r8.c: Regenerated. * generated/minloc1_16_s1.c: Regenerated. * generated/minloc1_16_s4.c: Regenerated. * generated/minloc1_4_i1.c: Regenerated. * generated/minloc1_4_i16.c: Regenerated. * generated/minloc1_4_i2.c: Regenerated. * generated/minloc1_4_i4.c: Regenerated. * generated/minloc1_4_i8.c: Regenerated. * generated/minloc1_4_r10.c: Regenerated. * generated/minloc1_4_r16.c: Regenerated. * generated/minloc1_4_r4.c: Regenerated. * generated/minloc1_4_r8.c: Regenerated. * generated/minloc1_4_s1.c: Regenerated. * generated/minloc1_4_s4.c: Regenerated. * generated/minloc1_8_i1.c: Regenerated. * generated/minloc1_8_i16.c: Regenerated. * generated/minloc1_8_i2.c: Regenerated. * generated/minloc1_8_i4.c: Regenerated. * generated/minloc1_8_i8.c: Regenerated. * generated/minloc1_8_r10.c: Regenerated. * generated/minloc1_8_r16.c: Regenerated. * generated/minloc1_8_r4.c: Regenerated. * generated/minloc1_8_r8.c: Regenerated. * generated/minloc1_8_s1.c: Regenerated. * generated/minloc1_8_s4.c: Regenerated. * generated/minval0_s1.c: Regenerated. * generated/minval0_s4.c: Regenerated. * generated/minval1_s1.c: Regenerated. * generated/minval1_s4.c: Regenerated. * generated/minval_i1.c: Regenerated. * generated/minval_i16.c: Regenerated. * generated/minval_i2.c: Regenerated. * generated/minval_i4.c: Regenerated. * generated/minval_i8.c: Regenerated. * generated/minval_r10.c: Regenerated. * generated/minval_r16.c: Regenerated. * generated/minval_r4.c: Regenerated. * generated/minval_r8.c: Regenerated. * generated/product_c10.c: Regenerated. * generated/product_c16.c: Regenerated. * generated/product_c4.c: Regenerated. * generated/product_c8.c: Regenerated. * generated/product_i1.c: Regenerated. * generated/product_i16.c: Regenerated. * generated/product_i2.c: Regenerated. * generated/product_i4.c: Regenerated. * generated/product_i8.c: Regenerated. * generated/product_r10.c: Regenerated. * generated/product_r16.c: Regenerated. * generated/product_r4.c: Regenerated. * generated/product_r8.c: Regenerated. * generated/sum_c10.c: Regenerated. * generated/sum_c16.c: Regenerated. * generated/sum_c4.c: Regenerated. * generated/sum_c8.c: Regenerated. * generated/sum_i1.c: Regenerated. * generated/sum_i16.c: Regenerated. * generated/sum_i2.c: Regenerated. * generated/sum_i4.c: Regenerated. * generated/sum_i8.c: Regenerated. * generated/sum_r10.c: Regenerated. * generated/sum_r16.c: Regenerated. * generated/sum_r4.c: Regenerated. * generated/sum_r8.c: Regenerated. 2018-12-31 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/82995 * gfortran.dg/optional_absent_4.f90: New test. * gfortran.dg/optional_absent_5.f90: New test. From-SVN: r267487
286 lines
7.0 KiB
Plaintext
286 lines
7.0 KiB
Plaintext
dnl Support macro file for intrinsic functions.
|
|
dnl Contains the generic sections of the array functions.
|
|
dnl This file is part of the GNU Fortran Runtime Library (libgfortran)
|
|
dnl Distributed under the GNU GPL with exception. See COPYING for details.
|
|
define(START_FOREACH_FUNCTION,
|
|
`
|
|
extern void name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
|
|
atype * const restrict array, GFC_LOGICAL_4);
|
|
export_proto(name`'rtype_qual`_'atype_code);
|
|
|
|
void
|
|
name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
|
|
atype * const restrict array, GFC_LOGICAL_4 back)
|
|
{
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
index_type dstride;
|
|
const atype_name *base;
|
|
rtype_name * restrict dest;
|
|
index_type rank;
|
|
index_type n;
|
|
|
|
rank = GFC_DESCRIPTOR_RANK (array);
|
|
if (rank <= 0)
|
|
runtime_error ("Rank of array needs to be > 0");
|
|
|
|
if (retarray->base_addr == NULL)
|
|
{
|
|
GFC_DIMENSION_SET(retarray->dim[0], 0, rank-1, 1);
|
|
retarray->dtype.rank = 1;
|
|
retarray->offset = 0;
|
|
retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
|
|
}
|
|
else
|
|
{
|
|
if (unlikely (compile_options.bounds_check))
|
|
bounds_iforeach_return ((array_t *) retarray, (array_t *) array,
|
|
"u_name");
|
|
}
|
|
|
|
dstride = GFC_DESCRIPTOR_STRIDE(retarray,0);
|
|
dest = retarray->base_addr;
|
|
for (n = 0; n < rank; n++)
|
|
{
|
|
sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
|
|
extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
|
|
count[n] = 0;
|
|
if (extent[n] <= 0)
|
|
{
|
|
/* Set the return value. */
|
|
for (n = 0; n < rank; n++)
|
|
dest[n * dstride] = 0;
|
|
return;
|
|
}
|
|
}
|
|
|
|
base = array->base_addr;
|
|
|
|
/* Initialize the return value. */
|
|
for (n = 0; n < rank; n++)
|
|
dest[n * dstride] = 1;
|
|
{
|
|
')dnl
|
|
define(START_FOREACH_BLOCK,
|
|
` while (base)
|
|
{
|
|
/* Implementation start. */
|
|
')dnl
|
|
define(FINISH_FOREACH_FUNCTION,
|
|
` /* Implementation end. */
|
|
/* Advance to the next element. */
|
|
base += sstride[0];
|
|
}
|
|
while (++count[0] != extent[0]);
|
|
n = 0;
|
|
do
|
|
{
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
the next dimension. */
|
|
count[n] = 0;
|
|
/* We could precalculate these products, but this is a less
|
|
frequently used path so probably not worth it. */
|
|
base -= sstride[n] * extent[n];
|
|
n++;
|
|
if (n >= rank)
|
|
{
|
|
/* Break out of the loop. */
|
|
base = NULL;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
count[n]++;
|
|
base += sstride[n];
|
|
}
|
|
}
|
|
while (count[n] == extent[n]);
|
|
}
|
|
}
|
|
}')dnl
|
|
define(START_MASKED_FOREACH_FUNCTION,
|
|
`
|
|
extern void `m'name`'rtype_qual`_'atype_code (rtype * const restrict,
|
|
atype * const restrict, gfc_array_l1 * const restrict,
|
|
GFC_LOGICAL_4);
|
|
export_proto(`m'name`'rtype_qual`_'atype_code);
|
|
|
|
void
|
|
`m'name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
|
|
atype * const restrict array,
|
|
gfc_array_l1 * const restrict mask, GFC_LOGICAL_4 back)
|
|
{
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
index_type mstride[GFC_MAX_DIMENSIONS];
|
|
index_type dstride;
|
|
rtype_name *dest;
|
|
const atype_name *base;
|
|
GFC_LOGICAL_1 *mbase;
|
|
int rank;
|
|
index_type n;
|
|
int mask_kind;
|
|
|
|
|
|
if (mask == NULL)
|
|
{
|
|
name`'rtype_qual`_'atype_code (retarray, array, back);
|
|
return;
|
|
}
|
|
|
|
rank = GFC_DESCRIPTOR_RANK (array);
|
|
if (rank <= 0)
|
|
runtime_error ("Rank of array needs to be > 0");
|
|
|
|
if (retarray->base_addr == NULL)
|
|
{
|
|
GFC_DIMENSION_SET(retarray->dim[0], 0, rank - 1, 1);
|
|
retarray->dtype.rank = 1;
|
|
retarray->offset = 0;
|
|
retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
|
|
}
|
|
else
|
|
{
|
|
if (unlikely (compile_options.bounds_check))
|
|
{
|
|
|
|
bounds_iforeach_return ((array_t *) retarray, (array_t *) array,
|
|
"u_name");
|
|
bounds_equal_extents ((array_t *) mask, (array_t *) array,
|
|
"MASK argument", "u_name");
|
|
}
|
|
}
|
|
|
|
mask_kind = GFC_DESCRIPTOR_SIZE (mask);
|
|
|
|
mbase = mask->base_addr;
|
|
|
|
if (mask_kind == 1 || mask_kind == 2 || mask_kind == 4 || mask_kind == 8
|
|
#ifdef HAVE_GFC_LOGICAL_16
|
|
|| mask_kind == 16
|
|
#endif
|
|
)
|
|
mbase = GFOR_POINTER_TO_L1 (mbase, mask_kind);
|
|
else
|
|
runtime_error ("Funny sized logical array");
|
|
|
|
dstride = GFC_DESCRIPTOR_STRIDE(retarray,0);
|
|
dest = retarray->base_addr;
|
|
for (n = 0; n < rank; n++)
|
|
{
|
|
sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
|
|
mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
|
|
extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
|
|
count[n] = 0;
|
|
if (extent[n] <= 0)
|
|
{
|
|
/* Set the return value. */
|
|
for (n = 0; n < rank; n++)
|
|
dest[n * dstride] = 0;
|
|
return;
|
|
}
|
|
}
|
|
|
|
base = array->base_addr;
|
|
|
|
/* Initialize the return value. */
|
|
for (n = 0; n < rank; n++)
|
|
dest[n * dstride] = 0;
|
|
{
|
|
')dnl
|
|
define(START_MASKED_FOREACH_BLOCK, `START_FOREACH_BLOCK')dnl
|
|
define(FINISH_MASKED_FOREACH_FUNCTION,
|
|
` /* Implementation end. */
|
|
/* Advance to the next element. */
|
|
base += sstride[0];
|
|
mbase += mstride[0];
|
|
}
|
|
while (++count[0] != extent[0]);
|
|
n = 0;
|
|
do
|
|
{
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
the next dimension. */
|
|
count[n] = 0;
|
|
/* We could precalculate these products, but this is a less
|
|
frequently used path so probably not worth it. */
|
|
base -= sstride[n] * extent[n];
|
|
mbase -= mstride[n] * extent[n];
|
|
n++;
|
|
if (n >= rank)
|
|
{
|
|
/* Break out of the loop. */
|
|
base = NULL;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
count[n]++;
|
|
base += sstride[n];
|
|
mbase += mstride[n];
|
|
}
|
|
}
|
|
while (count[n] == extent[n]);
|
|
}
|
|
}
|
|
}')dnl
|
|
define(FOREACH_FUNCTION,
|
|
`START_FOREACH_FUNCTION
|
|
$1
|
|
START_FOREACH_BLOCK
|
|
$2
|
|
FINISH_FOREACH_FUNCTION')dnl
|
|
define(MASKED_FOREACH_FUNCTION,
|
|
`START_MASKED_FOREACH_FUNCTION
|
|
$1
|
|
START_MASKED_FOREACH_BLOCK
|
|
$2
|
|
FINISH_MASKED_FOREACH_FUNCTION')dnl
|
|
define(SCALAR_FOREACH_FUNCTION,
|
|
`
|
|
extern void `s'name`'rtype_qual`_'atype_code (rtype * const restrict,
|
|
atype * const restrict, GFC_LOGICAL_4 *, GFC_LOGICAL_4);
|
|
export_proto(`s'name`'rtype_qual`_'atype_code);
|
|
|
|
void
|
|
`s'name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
|
|
atype * const restrict array,
|
|
GFC_LOGICAL_4 * mask, GFC_LOGICAL_4 back)
|
|
{
|
|
index_type rank;
|
|
index_type dstride;
|
|
index_type n;
|
|
rtype_name *dest;
|
|
|
|
if (mask == NULL || *mask)
|
|
{
|
|
name`'rtype_qual`_'atype_code (retarray, array, back);
|
|
return;
|
|
}
|
|
|
|
rank = GFC_DESCRIPTOR_RANK (array);
|
|
|
|
if (rank <= 0)
|
|
runtime_error ("Rank of array needs to be > 0");
|
|
|
|
if (retarray->base_addr == NULL)
|
|
{
|
|
GFC_DIMENSION_SET(retarray->dim[0], 0, rank-1, 1);
|
|
retarray->dtype.rank = 1;
|
|
retarray->offset = 0;
|
|
retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
|
|
}
|
|
else if (unlikely (compile_options.bounds_check))
|
|
{
|
|
bounds_iforeach_return ((array_t *) retarray, (array_t *) array,
|
|
"u_name");
|
|
}
|
|
|
|
dstride = GFC_DESCRIPTOR_STRIDE(retarray,0);
|
|
dest = retarray->base_addr;
|
|
for (n = 0; n<rank; n++)
|
|
dest[n * dstride] = $1 ;
|
|
}')dnl
|