procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fortran: Fix ICE due to elemental procedure pointers [PR98472].

Browse source 
2021-01-27  Paul Thomas  <pault@gcc.gnu.org>

gcc/fortran
	PR fortran/98472
	* trans-array.c (gfc_conv_expr_descriptor): Include elemental
	procedure pointers in the assert under the comment 'elemental
	function' and eliminate the second, spurious assert.

gcc/testsuite/
	PR fortran/98472
	* gfortran.dg/elemental_function_5.f90 : New test.
This commit is contained in:
Paul Thomas 2021-01-27 09:12:16 +00:00
parent da5c25f371
commit 003f041429
2 changed files with 48 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/fortran/trans-array.c
View file

@ -7477,9 +7477,9 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr)
&& expr->value.function.esym->attr.elemental)
|| (expr->value.function.isym != NULL
&& expr->value.function.isym->elemental)
|| (gfc_expr_attr (expr).proc_pointer
&& gfc_expr_attr (expr).elemental)
|| gfc_inline_intrinsic_function_p (expr));
else
gcc_assert (ss_type == GFC_SS_INTRINSIC);
need_tmp = 1;
if (expr->ts.type == BT_CHARACTER

46
gcc/testsuite/gfortran.dg/elemental_function_5.f90 Normal file
View file

@ -0,0 +1,46 @@
! { dg-do compile }
!
! Test the fix for PR98472.
!
! Contributed by Rui Coelho <ruicoelhopedro@hotmail.com>
!
module a
type, abstract :: base
contains
procedure(elem_func), deferred, nopass :: add
end type base
type, extends(base) :: derived
contains
procedure, nopass :: add => add_derived
end type derived
abstract interface
elemental function elem_func(x, y) result(out)
integer, intent(in) :: x, y
integer :: out
end function elem_func
end interface
contains
elemental function add_derived(x, y) result(out)
integer, intent(in) :: x, y
integer :: out
out = x + y
end function add_derived
end module a
program main
use a
call foo
contains
subroutine foo
integer, dimension(:), allocatable :: vec
class(base), allocatable :: instance
allocate(derived :: instance)
allocate(vec, source=instance%add([1, 2], [1, 2])) ! ICE here
if (any (vec .ne. [2, 4])) stop 1
end
end program main