aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Koenig <tkoenig@gcc.gnu.org>2011-08-21 12:02:12 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2011-08-21 12:02:12 +0000
commit2d27cb4477b945b1b836a357a0440fd7d8d6ca28 (patch)
tree0e5ad03159fa92780d35e2b2498740262aafcf90
parent5193535841f9a72931e48b9a5b5e4883b736ce0b (diff)
downloadgcc-2d27cb4477b945b1b836a357a0440fd7d8d6ca28.zip
gcc-2d27cb4477b945b1b836a357a0440fd7d8d6ca28.tar.gz
gcc-2d27cb4477b945b1b836a357a0440fd7d8d6ca28.tar.bz2
re PR fortran/50130 (ICE with invalid array slice)
2011-08-21 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/50130 * resolve.c (resolve_array_ref): Don't calculate upper bound if the stride is zero. 2011-08-21 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/50130 * gfortran.dg/zero_stride_1.f90: New test. From-SVN: r177940
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/resolve.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/zero_stride_1.f907
4 files changed, 21 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2e2a714..0f1f44c 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-21 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR fortran/50130
+ * resolve.c (resolve_array_ref): Don't calculate upper bound
+ if the stride is zero.
+
2011-08-20 Janus Weil <janus@gcc.gnu.org>
PR fortran/49638
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index ea184a2..85d2091 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -4569,10 +4569,11 @@ resolve_array_ref (gfc_array_ref *ar)
/* Fill in the upper bound, which may be lower than the
specified one for something like a(2:10:5), which is
identical to a(2:7:5). Only relevant for strides not equal
- to one. */
+ to one. Don't try a division by zero. */
if (ar->dimen_type[i] == DIMEN_RANGE
&& ar->stride[i] != NULL && ar->stride[i]->expr_type == EXPR_CONSTANT
- && mpz_cmp_si (ar->stride[i]->value.integer, 1L) != 0)
+ && mpz_cmp_si (ar->stride[i]->value.integer, 1L) != 0
+ && mpz_cmp_si (ar->stride[i]->value.integer, 0L) != 0)
{
mpz_t size, end;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d54fd2b..8a3d3f2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-21 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR fortran/50130
+ * gfortran.dg/zero_stride_1.f90: New test.
+
2011-08-20 Janus Weil <janus@gcc.gnu.org>
PR fortran/49638
diff --git a/gcc/testsuite/gfortran.dg/zero_stride_1.f90 b/gcc/testsuite/gfortran.dg/zero_stride_1.f90
new file mode 100644
index 0000000..c5f6cc7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/zero_stride_1.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR 50130 - this caused an ICE. Test case supplied by Joost
+! VandeVondele.
+integer, parameter :: a(10)=0
+integer, parameter :: b(10)=a(1:10:0) ! { dg-error "Illegal stride of zero" }
+END
+