From d73b65b6dbed146ca88c93a183eae1cbe7b430b1 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 31 May 2011 20:40:55 +0200 Subject: [PATCH] re PR fortran/18918 (Eventually support Fortran 2008's coarrays [co-arrays]) 2011-05-31 Tobias Burnus PR fortran/18918 * trans-array.c (gfc_trans_dummy_array_bias): Handle cobounds of assumed-shape arrays. 2011-05-31 Tobias Burnus PR fortran/18918 * gfortran.dg/coarray/dummy_1.f90: New. From-SVN: r174504 --- gcc/fortran/ChangeLog | 6 +++ gcc/fortran/trans-array.c | 2 + gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/gfortran.dg/coarray/dummy_1.f90 | 70 +++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/coarray/dummy_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ba7d7be..b962ff5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,6 +1,12 @@ 2011-05-31 Tobias Burnus PR fortran/18918 + * trans-array.c (gfc_trans_dummy_array_bias): Handle + cobounds of assumed-shape arrays. + +2011-05-31 Tobias Burnus + + PR fortran/18918 * resolve.c (resolve_fl_variable): Handle static coarrays with non-constant cobounds. diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 0c6c638..c7aeadb 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5232,6 +5232,8 @@ gfc_trans_dummy_array_bias (gfc_symbol * sym, tree tmpdesc, } } + gfc_trans_array_cobounds (type, &init, sym); + /* Set the offset. */ if (TREE_CODE (GFC_TYPE_ARRAY_OFFSET (type)) == VAR_DECL) gfc_add_modify (&init, GFC_TYPE_ARRAY_OFFSET (type), offset); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6765c11..f9fae62 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2011-05-31 Tobias Burnus PR fortran/18918 + * gfortran.dg/coarray/dummy_1.f90: New. + +2011-05-31 Tobias Burnus + + PR fortran/18918 * gfortran.dg/coarray/save_1.f90: New. * gfortran.dg/coarray_4.f90: Update dg-error. diff --git a/gcc/testsuite/gfortran.dg/coarray/dummy_1.f90 b/gcc/testsuite/gfortran.dg/coarray/dummy_1.f90 new file mode 100644 index 0000000..8e4b7d7 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray/dummy_1.f90 @@ -0,0 +1,70 @@ +! { dg-do run } +! +! PR fortran/18918 +! +! Check whether assumed-shape's cobounds are properly handled +! + implicit none + integer :: B(1)[*] + integer :: C(8:11)[-3:10,43:*] + integer, allocatable :: D(:)[:,:] + + allocate (D(20)[2:3,5:*]) + + call sub (B,5) + call sub (C,3) + call sub (D,3) + + call sub2 (B, -3) + call sub2 (C, 44) + call sub2 (D, 44) + + call sub3 (B) + call sub3 (C) + call sub3 (D) + + call sub4 (B) + call sub4 (C) + call sub4 (D) + + call sub5 (D) + contains + + subroutine sub(A,n) + integer :: n + integer :: A(n:)[n:2*n,3*n:*] + if (lbound(A,dim=1) /= n) call abort () + if (any (lcobound(A) /= [n, 3*n])) call abort () + if (ucobound(A, dim=1) /= 2*n) call abort() + end subroutine sub + + subroutine sub2(A,n) + integer :: n + integer :: A(:)[-n:*] + if (lbound(A,dim=1) /= 1) call abort () + if (lcobound(A, dim=1) /= -n) call abort () + end subroutine sub2 + + subroutine sub3(A) + integer :: A(:)[0,*] + if (lbound(A,dim=1) /= 1) call abort () + if (lcobound(A, dim=1) /= 1) call abort () + if (ucobound(A, dim=1) /= 0) call abort () + if (lcobound(A, dim=2) /= 1) call abort () + end subroutine sub3 + + subroutine sub4(A) + integer :: A(:)[*] + if (lbound(A,dim=1) /= 1) call abort () + if (lcobound(A, dim=1) /= 1) call abort () + end subroutine sub4 + + subroutine sub5(A) + integer, allocatable :: A(:)[:,:] + + if (lbound(A,dim=1) /= 1) call abort () + if (lcobound(A, dim=1) /= 2) call abort () + if (ucobound(A, dim=1) /= 3) call abort () + if (lcobound(A, dim=2) /= 5) call abort () + end subroutine sub5 + end -- 2.7.4