From: Paul Thomas Date: Sun, 16 Mar 2008 19:14:17 +0000 (+0000) Subject: re PR fortran/35470 (Valid pointer assigment code gives compilation errors) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c52938ec21193c37f7c1e76d0517dfe22620be94;p=gcc.git re PR fortran/35470 (Valid pointer assigment code gives compilation errors) 2008-03-16 Paul Thomas PR fortran/35470 * resolve.c (check_assumed_size_reference): Only visit the first reference and look directly at the highest dimension. 2008-03-16 Paul Thomas PR fortran/35470 * gfortran.dg/subref_array_pointer_3.f90 : New test. From-SVN: r133279 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 37572202f14..08f1a8c2c26 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-03-16 Paul Thomas + + PR fortran/35470 + * resolve.c (check_assumed_size_reference): Only visit the + first reference and look directly at the highest dimension. + 2008-03-15 Jerry DeLisle PR fortran/35184 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index f8cd803162f..3d8fd3c6f34 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -954,20 +954,12 @@ static int need_full_assumed_size = 0; static bool check_assumed_size_reference (gfc_symbol *sym, gfc_expr *e) { - gfc_ref *ref; - int dim; - int last = 1; - if (need_full_assumed_size || !(sym->as && sym->as->type == AS_ASSUMED_SIZE)) return false; - for (ref = e->ref; ref; ref = ref->next) - if (ref->type == REF_ARRAY) - for (dim = 0; dim < ref->u.ar.as->rank; dim++) - last = (ref->u.ar.end[dim] == NULL) - && (ref->u.ar.type == DIMEN_ELEMENT); - - if (last) + if ((e->ref->u.ar.end[e->ref->u.ar.as->rank - 1] == NULL) + && (e->ref->u.ar.as->type == AS_ASSUMED_SIZE) + && (e->ref->u.ar.type == DIMEN_ELEMENT)) { gfc_error ("The upper bound in the last dimension must " "appear in the reference to the assumed size " diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d6c830a3e18..10ead70ab01 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-03-16 Paul Thomas + + PR fortran/35470 + * gfortran.dg/subref_array_pointer_3.f90 : New test. + 2008-03-16 Richard Guenther PR middle-end/35607 diff --git a/gcc/testsuite/gfortran.dg/subref_array_pointer_3.f90 b/gcc/testsuite/gfortran.dg/subref_array_pointer_3.f90 new file mode 100644 index 00000000000..b345c9d6bfe --- /dev/null +++ b/gcc/testsuite/gfortran.dg/subref_array_pointer_3.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! Tests the fix for PR35470, in which the pointer assignment would fail +! because the assumed size 'arr' would get mixed up with the component +! 'p' in the check for the upper bound of an assumed size array. +! +! Contributed by Antony Lewis +! +subroutine sub(arr) + type real_pointer + real, pointer :: p(:) + end type real_pointer + type(real_pointer), dimension(*) :: arr + real, pointer :: p(:) + p => arr(1)%p +end subroutine