diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2020-08-28 09:02:58 +0100 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2020-08-28 09:02:58 +0100 |
| commit | 9d463ce7f983f03f0d65da03cfa430e29a0840c2 (patch) | |
| tree | 41ec23c59b00c5ee782babaea371f2d1fe85700f /gcc | |
| parent | 3ba43155d2b27978589b2c1b0c4fdbaf8d4bba4d (diff) | |
| download | gcc-9d463ce7f983f03f0d65da03cfa430e29a0840c2.zip gcc-9d463ce7f983f03f0d65da03cfa430e29a0840c2.tar.gz gcc-9d463ce7f983f03f0d65da03cfa430e29a0840c2.tar.bz2 | |
This patch fixes PR96624.
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/simplify.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/reshape_8.f90 | 14 |
2 files changed, 26 insertions, 2 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 074b50c..8e0d2f9 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -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; diff --git a/gcc/testsuite/gfortran.dg/reshape_8.f90 b/gcc/testsuite/gfortran.dg/reshape_8.f90 new file mode 100644 index 0000000..01799ac --- /dev/null +++ b/gcc/testsuite/gfortran.dg/reshape_8.f90 @@ -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" } } |