aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorThomas Koenig <tkoenig@gcc.gnu.org>2012-11-24 15:00:16 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2012-11-24 15:00:16 +0000
commit02bfa7081ea12b31860fb211321f31be67834a11 (patch)
tree647da4ddf3174be79b16c0e83b853a74358c3df5 /gcc/fortran
parent59ad52e0fbbab029cf9f5084555c48a8219229e1 (diff)
downloadgcc-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/fortran')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/resolve.c16
2 files changed, 19 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:
+ ;
}
}
}