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

This patch fixes PR96624.

Browse Source 
2020-08-28  Paul Thomas  <pault@gcc.gnu.org>

gcc/fortran
	PR fortran/96624
	* simplify.c (gfc_simplify_reshape): Detect zero shape and
	clear index if found.

gcc/testsuite/
	PR fortran/96624
	* gfortran.dg/reshape_8.f90 : New test.
This commit is contained in:
Paul Thomas 2020-08-28 09:02:58 +01:00
parent 3ba43155d2
commit 9d463ce7f9
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/fortran/simplify.c
View File

@ -6398,7 +6398,7 @@ gfc_simplify_is_contiguous (gfc_expr *array)
if (gfc_is_not_contiguous (array))
return gfc_get_logical_expr (gfc_default_logical_kind, &array->where, 0);
return NULL;
}
@ -6725,6 +6725,7 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
unsigned long j;
size_t nsource;
gfc_expr *e, *result;
bool zerosize = false;
/* Check that argument expression types are OK. */
if (!is_constant_array_expr (source)
@ -6847,7 +6848,14 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
result->rank = rank;
result->shape = gfc_get_shape (rank);
for (i = 0; i < rank; i++)
mpz_init_set_ui (result->shape[i], shape[i]);
{
mpz_init_set_ui (result->shape[i], shape[i]);
if (shape[i] == 0)
zerosize = true;
}
if (zerosize)
goto sizezero;
while (nsource > 0 || npad > 0)
{
@ -6897,6 +6905,8 @@ inc:
break;
}
sizezero:
mpz_clear (index);
return result;

14
gcc/testsuite/gfortran.dg/reshape_8.f90 Normal file
View File

@ -0,0 +1,14 @@
! { dg-do compile }
! { dg-options "-fdump-tree-original" }
!
! Test the fix for PR96624 in which an attempt was made to assign
! to the zero length temporary created by reshape, resulting in a segfault.
!
! Contributed by Dong Shenpo <shenpo.dong@compiler-dev.com>
!
program test
integer :: a(2,0)
a = reshape([1,2,3,4], [2,0])
print *, a
end
! { dg-final { scan-tree-dump-times "data" 4 "original" } }