public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-6900] Fortran: add missing conversions for result of intrinsics to result type
@ 2022-01-27 19:23 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2022-01-27 19:23 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:7eb61a45a171d4f8f5bf4d4f469d42e657c69a6a
commit r12-6900-g7eb61a45a171d4f8f5bf4d4f469d42e657c69a6a
Author: Harald Anlauf <anlauf@gmx.de>
Date: Thu Jan 27 20:23:00 2022 +0100
Fortran: add missing conversions for result of intrinsics to result type
gcc/fortran/ChangeLog:
PR fortran/84784
* trans-intrinsic.cc (conv_intrinsic_image_status): Convert result
to resulting (default) integer type.
(conv_intrinsic_team_number): Likewise.
(gfc_conv_intrinsic_popcnt_poppar): Likewise.
gcc/testsuite/ChangeLog:
PR fortran/84784
* gfortran.dg/pr84784.f90: New test.
Diff:
---
gcc/fortran/trans-intrinsic.cc | 13 +++++++------
gcc/testsuite/gfortran.dg/pr84784.f90 | 27 +++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/gcc/fortran/trans-intrinsic.cc b/gcc/fortran/trans-intrinsic.cc
index fccf0a9b229..da854fad89d 100644
--- a/gcc/fortran/trans-intrinsic.cc
+++ b/gcc/fortran/trans-intrinsic.cc
@@ -2620,7 +2620,7 @@ conv_intrinsic_image_status (gfc_se *se, gfc_expr *expr)
else
gcc_unreachable ();
- se->expr = tmp;
+ se->expr = fold_convert (gfc_get_int_type (gfc_default_integer_kind), tmp);
}
static void
@@ -2662,7 +2662,7 @@ conv_intrinsic_team_number (gfc_se *se, gfc_expr *expr)
else
gcc_unreachable ();
- se->expr = tmp;
+ se->expr = fold_convert (gfc_get_int_type (gfc_default_integer_kind), tmp);
}
@@ -7255,12 +7255,13 @@ gfc_conv_intrinsic_popcnt_poppar (gfc_se * se, gfc_expr *expr, int parity)
/* Combine the results. */
if (parity)
- se->expr = fold_build2_loc (input_location, BIT_XOR_EXPR, result_type,
- call1, call2);
+ se->expr = fold_build2_loc (input_location, BIT_XOR_EXPR,
+ integer_type_node, call1, call2);
else
- se->expr = fold_build2_loc (input_location, PLUS_EXPR, result_type,
- call1, call2);
+ se->expr = fold_build2_loc (input_location, PLUS_EXPR,
+ integer_type_node, call1, call2);
+ se->expr = convert (result_type, se->expr);
return;
}
diff --git a/gcc/testsuite/gfortran.dg/pr84784.f90 b/gcc/testsuite/gfortran.dg/pr84784.f90
new file mode 100644
index 00000000000..3129b927687
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr84784.f90
@@ -0,0 +1,27 @@
+! { dg-do compile }
+! { dg-options "-fcoarray=lib -fdefault-integer-8" }
+! { dg-require-effective-target fortran_integer_16 }
+! PR fortran/84784 - ICEs: verify_gimple failed with -fdefault-integer-8
+
+ use iso_fortran_env, only : team_type, STAT_FAILED_IMAGE
+ implicit none
+ type(team_type) :: team
+ integer :: new_team
+ new_team = mod(this_image(),2)+1
+ form team (new_team,team)
+ change team (team)
+ if (team_number() /= new_team) STOP 1
+ end team
+ if (image_status (1) == STAT_FAILED_IMAGE) ERROR STOP "cannot recover"
+ if (runtime_popcnt(0_16) /= 0) STOP 2
+ if (runtime_poppar(1_16) /= 1) STOP 3
+contains
+ integer function runtime_popcnt (i)
+ integer(kind=16), intent(in) :: i
+ runtime_popcnt = popcnt(i)
+ end function
+ integer function runtime_poppar (i)
+ integer(kind=16), intent(in) :: i
+ runtime_poppar = poppar(i)
+ end function
+end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-27 19:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-27 19:23 [gcc r12-6900] Fortran: add missing conversions for result of intrinsics to result type Harald Anlauf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).