diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2012-11-24 15:00:16 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2012-11-24 15:00:16 +0000 |
| commit | 02bfa7081ea12b31860fb211321f31be67834a11 (patch) | |
| tree | 647da4ddf3174be79b16c0e83b853a74358c3df5 /gcc | |
| parent | 59ad52e0fbbab029cf9f5084555c48a8219229e1 (diff) | |
| download | gcc-02bfa7081ea12b31860fb211321f31be67834a11.zip gcc-02bfa7081ea12b31860fb211321f31be67834a11.tar.gz gcc-02bfa7081ea12b31860fb211321f31be67834a11.tar.bz2 | |
re PR fortran/55314 (Rejects some valid ALLOCATE statements)
2012-11-24 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/55314
* resolve.c (resolve_allocate_deallocate): Compare all
subscripts when deciding if to reject a (de)allocate
statement.
2012-11-24 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/55314
* gfortran.dg/allocate_error_4.f90: New test.
From-SVN: r193778
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocate_error_4.f90 | 16 |
4 files changed, 40 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3b5b27c..7f8e6dc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2012-11-24 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/55314 + * resolve.c (resolve_allocate_deallocate): Compare all + subscripts when deciding if to reject a (de)allocate + statement. + 2012-11-21 Janus Weil <janus@gcc.gnu.org> PR fortran/55352 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 53d695cd..f3d3beb 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7622,12 +7622,18 @@ resolve_allocate_deallocate (gfc_code *code, const char *fcn) if (pr->next && qr->next) { + int i; gfc_array_ref *par = &(pr->u.ar); gfc_array_ref *qar = &(qr->u.ar); - if ((par->start[0] != NULL || qar->start[0] != NULL) - && gfc_dep_compare_expr (par->start[0], - qar->start[0]) != 0) - break; + + for (i=0; i<par->dimen; i++) + { + if ((par->start[i] != NULL + || qar->start[i] != NULL) + && gfc_dep_compare_expr (par->start[i], + qar->start[i]) != 0) + goto break_label; + } } } else @@ -7639,6 +7645,8 @@ resolve_allocate_deallocate (gfc_code *code, const char *fcn) pr = pr->next; qr = qr->next; } + break_label: + ; } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8df8cab..f962907 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-11-24 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/55314 + * gfortran.dg/allocate_error_4.f90: New test. + 2012-11-24 Hans-Peter Nilsson <hp@bitrange.com> * lib/gcc-gdb-test.exp (gdb-test): Pass -- as first argument diff --git a/gcc/testsuite/gfortran.dg/allocate_error_4.f90 b/gcc/testsuite/gfortran.dg/allocate_error_4.f90 new file mode 100644 index 0000000..6652b47 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/allocate_error_4.f90 @@ -0,0 +1,16 @@ +! { dg-do compile } +! PR fortran/55314 - the second allocate statement was rejected. + +program main + implicit none + integer :: max_nb + type comm_mask + integer(4), pointer :: mask(:) + end type comm_mask + type (comm_mask), allocatable, save :: encode(:,:) + max_nb=2 + allocate( encode(1:1,1:max_nb)) + allocate( encode(1,1)%mask(1),encode(1,2)%mask(1)) + deallocate( encode(1,1)%mask,encode(1,2)%mask) + allocate( encode(1,1)%mask(1),encode(1,1)%mask(1)) ! { dg-error "also appears at" } +end program main |