OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fortran - fix conversion to result type for the min/max intrinsic 

gcc/fortran/ChangeLog:

	PR fortran/100283
	PR fortran/101123
	* trans-intrinsic.c (gfc_conv_intrinsic_minmax): Unconditionally
	convert result of min/max to result type.

gcc/testsuite/ChangeLog:

	PR fortran/100283
	PR fortran/101123
	* gfortran.dg/min0_max0_1.f90: New test.
	* gfortran.dg/min0_max0_2.f90: New test.
This commit is contained in:
Harald Anlauf 2021-06-18 19:34:15 +02:00
parent 3bb85b8687
commit 6fc5433963
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/trans-intrinsic.c
View File

@ -4147,10 +4147,7 @@ gfc_conv_intrinsic_minmax (gfc_se * se, gfc_expr * expr, enum tree_code op)
build_empty_stmt (input_location));
gfc_add_expr_to_block (&se->pre, tmp);
}
if (TREE_CODE (type) == INTEGER_TYPE)
se->expr = fold_build1_loc (input_location, FIX_TRUNC_EXPR, type, mvar);
else
se->expr = convert (type, mvar);
se->expr = convert (type, mvar);
}

9
gcc/testsuite/gfortran.dg/min0_max0_1.f90 Normal file
View File

@ -0,0 +1,9 @@
! { dg-do compile }
! { dg-options "-std=gnu" }
! PR fortran/100283
subroutine s ()
integer(kind=8) :: i,j,k
i = min0 (j,k)
i = max0 (-127_8, min0 (j,127_8))
end subroutine s

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

@ -0,0 +1,10 @@
! { dg-do compile }
! { dg-options "-fdefault-integer-8 -std=gnu" }
! PR fortran/101123
SUBROUTINE TEST
IMPLICIT INTEGER*4 (I-N)
MAXMN=MAX0(M,N)
MINMN=MIN0(M,0_4)
MAXRS=MAX1(R,S)
END SUBROUTINE TEST