diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-03-16 02:43:02 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-03-16 02:43:02 +0000 |
| commit | 93d1ab50c5a8843e7d6779d4f6956241f8444e50 (patch) | |
| tree | 289e0ca4a99997cb08da90b19d15003cf1b3962b /gcc | |
| parent | 39f5f2ed510300026d83e84ac0b2f83f6d55e427 (diff) | |
| download | gcc-93d1ab50c5a8843e7d6779d4f6956241f8444e50.zip gcc-93d1ab50c5a8843e7d6779d4f6956241f8444e50.tar.gz gcc-93d1ab50c5a8843e7d6779d4f6956241f8444e50.tar.bz2 | |
re PR fortran/69395 (ICE on declaring array with more than 7 dimensions+codimensions)
2018-03-15 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/69395
* decl.c (merge_array_spec): Limit the merging to maximum allowed
dimensions, and issue error message if limit is exceeded.
2018-03-15 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/69395
* gfortran.dg/pr69395.f90: New test.
From-SVN: r258580
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 34 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr69395.f90 | 5 |
4 files changed, 43 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 19854f1..6e1af90 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-03-15 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/69395 + * decl.c (merge_array_spec): Limit the merging to maximum allowed + dimensions, and issue error message if limit is exceeded. + 2018-03-13 Steven G. Kargl <kargl@gcc.gnu.org> * check.c (gfc_check_kill_sub): Remove check for INTEGER(4) or (8). diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 1609643..f5e6b31 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -804,7 +804,7 @@ cleanup: static bool merge_array_spec (gfc_array_spec *from, gfc_array_spec *to, bool copy) { - int i; + int i, j; if ((from->type == AS_ASSUMED_RANK && to->corank) || (to->type == AS_ASSUMED_RANK && from->corank)) @@ -822,8 +822,14 @@ merge_array_spec (gfc_array_spec *from, gfc_array_spec *to, bool copy) for (i = 0; i < to->corank; i++) { - to->lower[from->rank + i] = to->lower[i]; - to->upper[from->rank + i] = to->upper[i]; + /* Do not exceed the limits on lower[] and upper[]. gfortran + cleans up elsewhere. */ + j = from->rank + i; + if (j >= GFC_MAX_DIMENSIONS) + break; + + to->lower[j] = to->lower[i]; + to->upper[j] = to->upper[i]; } for (i = 0; i < from->rank; i++) { @@ -846,19 +852,33 @@ merge_array_spec (gfc_array_spec *from, gfc_array_spec *to, bool copy) for (i = 0; i < from->corank; i++) { + /* Do not exceed the limits on lower[] and upper[]. gfortran + cleans up elsewhere. */ + j = to->rank + i; + if (j >= GFC_MAX_DIMENSIONS) + break; + if (copy) { - to->lower[to->rank + i] = gfc_copy_expr (from->lower[i]); - to->upper[to->rank + i] = gfc_copy_expr (from->upper[i]); + to->lower[j] = gfc_copy_expr (from->lower[i]); + to->upper[j] = gfc_copy_expr (from->upper[i]); } else { - to->lower[to->rank + i] = from->lower[i]; - to->upper[to->rank + i] = from->upper[i]; + to->lower[j] = from->lower[i]; + to->upper[j] = from->upper[i]; } } } + if (to->rank + to->corank >= GFC_MAX_DIMENSIONS) + { + gfc_error ("Sum of array rank %d and corank %d at %C exceeds maximum " + "allowed dimensions of %d", + to->rank, to->corank, GFC_MAX_DIMENSIONS); + to->corank = GFC_MAX_DIMENSIONS - to->rank; + return false; + } return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ca6618f..9db78cd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-15 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/69395 + * gfortran.dg/pr69395.f90: New test. + 2018-03-15 Jakub Jelinek <jakub@redhat.com> PR c++/79085 diff --git a/gcc/testsuite/gfortran.dg/pr69395.f90 b/gcc/testsuite/gfortran.dg/pr69395.f90 new file mode 100644 index 0000000..ea98baa --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr69395.f90 @@ -0,0 +1,5 @@ +! { dg-do compile } +! { dg-options "-fcoarray=single" } +program p +real, dimension(1,2,1,2,1,2,1,2), codimension[1,2,1,2,1,2,1,*] :: z ! { dg-error "allowed dimensions" } +end |