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

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.
This commit is contained in:
Harald Anlauf 2022-01-27 20:23:00 +01:00
parent bb6a8d1d52
commit 7eb61a45a1
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/fortran/trans-intrinsic.cc
View File

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

27
gcc/testsuite/gfortran.dg/pr84784.f90 Normal file
View File

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