From 1c3339af10c27fafd9573c0a77c79144e23ebc51 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Wed, 14 May 2008 21:44:36 +0000 Subject: [PATCH] re PR fortran/36059 (-frepack-arrays: symbols w/ TARGET should not be repacked) PR fortran/36059 * trans-decl.c (gfc_build_dummy_array_decl): Don't repack arrays that have the TARGET attribute. * gfortran.dg/repack_arrays_1.f90: New test. From-SVN: r135310 --- gcc/fortran/ChangeLog | 6 +++++ gcc/fortran/trans-decl.c | 5 +++- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gfortran.dg/repack_arrays_1.f90 | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/repack_arrays_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c38717cda56..c39b86e25cf 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-05-14 Francois-Xavier Coudert + + PR fortran/36059 + * trans-decl.c (gfc_build_dummy_array_decl): Don't repack + arrays that have the TARGET attribute. + 2008-05-14 Francois-Xavier Coudert PR fortran/36186 diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 6e0b5425a91..aa3712ce4fd 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -733,7 +733,10 @@ gfc_build_dummy_array_decl (gfc_symbol * sym, tree dummy) /* Create a descriptorless array pointer. */ as = sym->as; packed = PACKED_NO; - if (!gfc_option.flag_repack_arrays) + + /* Even when -frepack-arrays is used, symbols with TARGET attribute + are not repacked. */ + if (!gfc_option.flag_repack_arrays || sym->attr.target) { if (as->type == AS_ASSUMED_SIZE) packed = PACKED_FULL; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9abe367154d..02ef0b5f8cb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-05-14 Francois-Xavier Coudert + + PR fortran/36059 + * gfortran.dg/repack_arrays_1.f90: New test. + 2008-05-14 Francois-Xavier Coudert PR fortran/36186 diff --git a/gcc/testsuite/gfortran.dg/repack_arrays_1.f90 b/gcc/testsuite/gfortran.dg/repack_arrays_1.f90 new file mode 100644 index 00000000000..adf20aa9095 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/repack_arrays_1.f90 @@ -0,0 +1,24 @@ +! { dg-do run } +! { dg-options "-frepack-arrays" } +! +! Check that arrays marked with TARGET attribute are not repacked. +! +program test2 + use iso_c_binding + implicit none + real, target :: x(7) + type(c_ptr) cp1, cp2 + + x = 42 + if (.not. c_associated(c_loc(x(3)),point(x(::2)))) call abort +contains + function point(x) + use iso_c_binding + real, intent(in), target :: x(:) + type(c_ptr) point + real, pointer :: p + + p => x(2) + point = c_loc(p) + end function point +end program test2