mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-31 15:11:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR libfortran/30415 (MINLOC, MAXLOC missing for integer kinds 1 and 2)

Browse Source 
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
This commit is contained in:
Thomas Koenig 2007-01-11 20:32:42 +00:00 committed by Thomas Koenig
parent 583cb3d38f
commit 90d715b0a5
4 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/fortran/ChangeLog
View File

@ -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.

26
gcc/fortran/iresolve.c
View File

@ -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);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-11 Thomas Koenig <Thomas.Koenig@online.de>
PR libfortran/30415
* minmaxloc_integer_kinds_1.f90: New test.
2007-01-11 Simon Martin <simartin@users.sourceforge.net>
PR c++/29573

10
gcc/testsuite/gfortran.dg/minmaxloc_integer_kinds_1.f90 Normal file
View File

@ -0,0 +1,10 @@
! { dg-do link }
! PR 30415 - minloc and maxloc for integer kinds=1 and 2 were missing
! Test case by Harald Anlauf
program gfcbug55
integer(kind=1) :: i1(4) = 1
integer(kind=2) :: i2(4) = 1
print *, minloc(i1), maxloc(i1)
print *, minloc(i2), maxloc(i2)
end program gfcbug55