diff options
| author | Thomas Koenig <Thomas.Koenig@online.de> | 2007-01-11 20:32:42 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2007-01-11 20:32:42 +0000 |
| commit | 90d715b0a524cb1dc534f470bc552915bb41663c (patch) | |
| tree | dd3320fb0f0e8dd37c2f392a040157b60b01bd81 /gcc/fortran | |
| parent | 583cb3d38f9c3a1b93938dd851e48af24827626d (diff) | |
| download | gcc-90d715b0a524cb1dc534f470bc552915bb41663c.zip gcc-90d715b0a524cb1dc534f470bc552915bb41663c.tar.gz gcc-90d715b0a524cb1dc534f470bc552915bb41663c.tar.bz2 | |
re PR libfortran/30415 (MINLOC, MAXLOC missing for integer kinds 1 and 2)
2007-01-11 Thomas Koenig <Thomas.Koenig@online.de>
PR libfortran/30415
* iresolve.c (gfc_resolve_maxloc): If the rank
of the return array is nonzero and we process an
integer array smaller than default kind, coerce
the array to default integer.
* iresolve.c (gfc_resolve_minloc): Likewise.
2007-01-11 Thomas Koenig <Thomas.Koenig@online.de>
PR libfortran/30415
* minmaxloc_integer_kinds_1.f90: New test.
From-SVN: r120685
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/iresolve.c | 26 |
2 files changed, 35 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5d093c4..367e170 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2007-01-11 Thomas Koenig <Thomas.Koenig@online.de> + + PR libfortran/30415 + * iresolve.c (gfc_resolve_maxloc): If the rank + of the return array is nonzero and we process an + integer array smaller than default kind, coerce + the array to default integer. + * iresolve.c (gfc_resolve_minloc): Likewise. + 2007-01-11 Brooks Moses <brooks.moses@codesourcery.com> * simplify.c: Update copyright to 2007. diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 63741f2..4ded73d 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -1231,6 +1231,19 @@ gfc_resolve_maxloc (gfc_expr *f, gfc_expr *array, gfc_expr *dim, else name = "maxloc"; + /* If the rank of the function is nonzero, we are going to call + a library function. Coerce the argument to one of the + existing library functions for this case. */ + + if (f->rank != 0 && array->ts.type == BT_INTEGER + && array->ts.kind < gfc_default_integer_kind) + { + gfc_typespec ts; + ts.type = BT_INTEGER; + ts.kind = gfc_default_integer_kind; + gfc_convert_type_warn (array, &ts, 2, 0); + } + f->value.function.name = gfc_get_string (PREFIX ("%s%d_%d_%c%d"), name, dim != NULL, f->ts.kind, gfc_type_letter (array->ts.type), array->ts.kind); @@ -1385,6 +1398,19 @@ gfc_resolve_minloc (gfc_expr *f, gfc_expr *array, gfc_expr *dim, else name = "minloc"; + /* If the rank of the function is nonzero, we are going to call + a library function. Coerce the argument to one of the + existing library functions for this case. */ + + if (f->rank != 0 && array->ts.type == BT_INTEGER + && array->ts.kind < gfc_default_integer_kind) + { + gfc_typespec ts; + ts.type = BT_INTEGER; + ts.kind = gfc_default_integer_kind; + gfc_convert_type_warn (array, &ts, 2, 0); + } + f->value.function.name = gfc_get_string (PREFIX ("%s%d_%d_%c%d"), name, dim != NULL, f->ts.kind, gfc_type_letter (array->ts.type), array->ts.kind); |