From e85df92e7d3da03b3f893d378c5c64ceee1de7e1 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Thu, 21 Apr 2011 10:29:41 +0200 Subject: re PR fortran/18918 (Eventually support Fortran 2008's coarrays [co-arrays]) 2011-04-21 Tobias Burnus PR fortran/18918 * array.c (gfc_match_array_spec): Fix maximal rank(+corank) check. 2011-04-21 Tobias Burnus PR fortran/18918 * gfortran.dg/coarray_18.f90: New. From-SVN: r172812 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/array.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9e949b3..25ef329 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2011-04-21 Tobias Burnus + + PR fortran/18918 + * array.c (gfc_match_array_spec): Fix maximal rank(+corank) check. + 2011-04-20 Jim Meyering * expr.c (free_expr0): Remove useless if-before-free. diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index e93cf9b..1394e17 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -576,6 +576,13 @@ coarray: goto cleanup; } + if (as->rank >= GFC_MAX_DIMENSIONS) + { + gfc_error ("Array specification at %C has more than %d " + "dimensions", GFC_MAX_DIMENSIONS); + goto cleanup; + } + for (;;) { as->corank++; @@ -644,7 +651,7 @@ coarray: goto cleanup; } - if (as->corank >= GFC_MAX_DIMENSIONS) + if (as->rank + as->corank >= GFC_MAX_DIMENSIONS) { gfc_error ("Array specification at %C has more than %d " "dimensions", GFC_MAX_DIMENSIONS); -- cgit v1.1