diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2021-06-18 19:34:15 +0200 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2021-06-18 19:34:15 +0200 |
| commit | 6fc543396345900f460c9fa7121239cb1ebbc3a3 (patch) | |
| tree | 184c6f665e9a128f4ee13f38311fafaadb796622 | |
| parent | 3bb85b868722e69aef0d37858c0dc3c88d92a0eb (diff) | |
| download | gcc-6fc543396345900f460c9fa7121239cb1ebbc3a3.zip gcc-6fc543396345900f460c9fa7121239cb1ebbc3a3.tar.gz gcc-6fc543396345900f460c9fa7121239cb1ebbc3a3.tar.bz2 | |
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.
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/min0_max0_1.f90 | 9 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/min0_max0_2.f90 | 10 |
3 files changed, 20 insertions, 4 deletions
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 73b0bcc..e578449 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -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); } diff --git a/gcc/testsuite/gfortran.dg/min0_max0_1.f90 b/gcc/testsuite/gfortran.dg/min0_max0_1.f90 new file mode 100644 index 0000000..118b0f0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/min0_max0_1.f90 @@ -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 diff --git a/gcc/testsuite/gfortran.dg/min0_max0_2.f90 b/gcc/testsuite/gfortran.dg/min0_max0_2.f90 new file mode 100644 index 0000000..3fe4fcd --- /dev/null +++ b/gcc/testsuite/gfortran.dg/min0_max0_2.f90 @@ -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 |