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

Fix PR fortran/93671; ICE in reffing coarray alloc. comps.

Browse source 
Fix an ICE when in a coarray an allocatable component had another allocatable
component.

gcc/fortran/ChangeLog:

2020-08-10  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/93671
	* trans-array.c (structure_alloc_comps): Keep caf-mode when applying to
	components; get the caf_token correctly for allocated scalar components.

gcc/testsuite/ChangeLog:

2020-08-10  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/93671
	* gfortran.dg/coarray/pr93671.f90: New test.
This commit is contained in:
Andre Vehreschild 2020-08-13 16:06:31 +02:00
parent db46153808
commit e00464a5cb
2 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8627,14 +8627,13 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl,
vref = gfc_build_array_ref (var, index, NULL);
if ((purpose == COPY_ALLOC_COMP || purpose == COPY_ONLY_ALLOC_COMP)
&& !caf_enabled (caf_mode))
if (purpose == COPY_ALLOC_COMP || purpose == COPY_ONLY_ALLOC_COMP)
{
tmp = build_fold_indirect_ref_loc (input_location,
gfc_conv_array_data (dest));
dref = gfc_build_array_ref (tmp, index, NULL);
tmp = structure_alloc_comps (der_type, vref, dref, rank,
COPY_ALLOC_COMP, 0, args);
COPY_ALLOC_COMP, caf_mode, args);
}
else
tmp = structure_alloc_comps (der_type, vref, NULL_TREE, rank, purpose,
@ -9375,12 +9374,21 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl,
else if (flag_coarray == GFC_FCOARRAY_LIB
&& caf_in_coarray (caf_mode))
{
tree dst_tok = c->as ? gfc_conv_descriptor_token (dcmp)
: fold_build3_loc (input_location,
COMPONENT_REF,
pvoid_type_node, dest,
c->caf_token,
NULL_TREE);
tree dst_tok;
if (c->as)
dst_tok = gfc_conv_descriptor_token (dcmp);
else
{
/* For a scalar allocatable component the caf_token is
the next component. */
if (!c->caf_token)
c->caf_token = c->next->backend_decl;
dst_tok = fold_build3_loc (input_location,
COMPONENT_REF,
pvoid_type_node, dest,
c->caf_token,
NULL_TREE);
}
tmp = duplicate_allocatable_coarray (dcmp, dst_tok, comp,
ctype, rank);
}

24
gcc/testsuite/gfortran.dg/coarray/pr93671.f90 Normal file
View file

@ -0,0 +1,24 @@
! { dg-do run }
! PR/fortran 93671 - ICE on intrinsic assignment to allocatable derived-type
! component of coarray
type flux_planes
integer, allocatable :: normals
end type
type package
type(flux_planes) surface_fluxes(1)
end type
type(package) mail[*], halo_data
halo_data%surface_fluxes(1)%normals = 1
mail = halo_data
if (any(size(mail%surface_fluxes) /= [1]) .OR. &
mail%surface_fluxes(1)%normals /= 1) then
stop 1
end if
end