diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-17 05:54:42 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-17 05:54:42 +0000 |
| commit | 532691cbf32df968dc34e6f6c4f5be27940f5cb4 (patch) | |
| tree | 7c27b8443697acbc5006880c4e3b22f8ddef9623 /gcc | |
| parent | ae71e4294809d2e42f7f512b87221cd29c62f079 (diff) | |
| download | ppe42-gcc-532691cbf32df968dc34e6f6c4f5be27940f5cb4.tar.gz ppe42-gcc-532691cbf32df968dc34e6f6c4f5be27940f5cb4.zip | |
2008-07-17 Tobias Burnus <burnus@net-b.de>
PR fortran/36825
PR fortran/36824
* array.c (gfc_match_array_spec): Fix array-rank check.
* resolve.c (resolve_fl_derived): Fix constentness check
for the array dimensions.
2008-07-17 Tobias Burnus <burnus@net-b.de>
PR fortran/36825
PR fortran/36824
* gfortran.dg/rank_2.f90: Add additional array-rank test.
* gfortran.dg/array_4.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137910 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/array.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/rank_2.f90 | 4 |
5 files changed, 21 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e36e8089c24..5febef3a63b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2008-07-17 Tobias Burnus <burnus@net-b.de> + + PR fortran/36825 + PR fortran/36824 + * array.c (gfc_match_array_spec): Fix array-rank check. + * resolve.c (resolve_fl_derived): Fix constentness check + for the array dimensions. + 2008-07-14 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Make-lang.in (gfortranspec.o): Fix dependencies. diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index c6bb5e857b9..1f41701ca96 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -437,7 +437,7 @@ gfc_match_array_spec (gfc_array_spec **asp) goto cleanup; } - if (as->rank > 7 + if (as->rank >= 7 && gfc_notify_std (GFC_STD_F2008, "Fortran 2008: Array " "specification at %C with more than 7 dimensions") == FAILURE) diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 273f2ae746b..a1baa9e8d75 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7682,8 +7682,8 @@ resolve_fl_derived (gfc_symbol *sym) for (i = 0; i < c->as->rank; i++) { if (c->as->lower[i] == NULL - || !gfc_is_constant_expr (c->as->lower[i]) || (resolve_index_expr (c->as->lower[i]) == FAILURE) + || !gfc_is_constant_expr (c->as->lower[i]) || c->as->upper[i] == NULL || (resolve_index_expr (c->as->upper[i]) == FAILURE) || !gfc_is_constant_expr (c->as->upper[i])) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0eb8eaa2baf..54da1a1b18d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-07-17 Tobias Burnus <burnus@net-b.de> + + PR fortran/36825 + PR fortran/36824 + * gfortran.dg/rank_2.f90: Add additional array-rank test. + * gfortran.dg/array_4.f90: New. + 2008-07-17 H.J. Lu <hongjiu.lu@intel.com> PR testsuite/36443 diff --git a/gcc/testsuite/gfortran.dg/rank_2.f90 b/gcc/testsuite/gfortran.dg/rank_2.f90 index b7d75dbeae4..cd52cc446e2 100644 --- a/gcc/testsuite/gfortran.dg/rank_2.f90 +++ b/gcc/testsuite/gfortran.dg/rank_2.f90 @@ -5,4 +5,8 @@ ! Fortran 2008 allows 15 dimensions (including co-array ranks) ! integer :: a(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ! { dg-error "more than 7 dimensions" } + +! PR fortran/36825: +integer,parameter :: N=10 +complex,dimension(-N:N,-N:N,0:1,0:1,-N:N,-N:N,0:1,0:1) :: P ! { dg-error "more than 7 dimensions" } end |
