diff options
| author | Erik Edelmann <eedelman@gcc.gnu.org> | 2006-03-09 21:46:14 +0000 |
|---|---|---|
| committer | Erik Edelmann <eedelman@gcc.gnu.org> | 2006-03-09 21:46:14 +0000 |
| commit | 17029ac2c3a874073805f11941a7b5f888923d3a (patch) | |
| tree | a7ae8c2256c3a5368277e817602f6d8d58322f71 /gcc | |
| parent | a8c1d5f80e0b710089f7e5f6265bdc345c7b514f (diff) | |
| download | gcc-17029ac2c3a874073805f11941a7b5f888923d3a.zip gcc-17029ac2c3a874073805f11941a7b5f888923d3a.tar.gz gcc-17029ac2c3a874073805f11941a7b5f888923d3a.tar.bz2 | |
trans-expr.c (gfc_add_interface_mapping): Copy 'allocatable' attribute from sym to new_sym.
fortran/
2006-03-09 Erik Edelmann <eedelman@gcc.gnu.org>
* trans-expr.c (gfc_add_interface_mapping): Copy 'allocatable'
attribute from sym to new_sym. Call build_fold_indirect_ref()
for allocatable arguments.
testsuite/
2006-03-09 Erik Edelmann <eedelman@gcc.gnu.org>
* gfortran.dg/allocatable_dummy_1.f90: Test for functions returning
arrays too.
From-SVN: r111910
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocatable_dummy_1.f90 | 9 |
4 files changed, 24 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dc1cdea..2e3d0f2 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2006-03-09 Erik Edelmann <eedelman@gcc.gnu.org> + + * trans-expr.c (gfc_add_interface_mapping): Copy 'allocatable' + attribute from sym to new_sym. Call build_fold_indirect_ref() + for allocatable arguments. + 2006-03-09 Paul Thomas <pault@gcc.gnu.org> PR fortran/26257 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 8c63b11..d1570a7 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -1316,6 +1316,7 @@ gfc_add_interface_mapping (gfc_interface_mapping * mapping, new_sym->attr.referenced = 1; new_sym->attr.dimension = sym->attr.dimension; new_sym->attr.pointer = sym->attr.pointer; + new_sym->attr.allocatable = sym->attr.allocatable; new_sym->attr.flavor = sym->attr.flavor; /* Create a fake symtree for it. */ @@ -1367,8 +1368,9 @@ gfc_add_interface_mapping (gfc_interface_mapping * mapping, value = build_fold_indirect_ref (value); } - /* If the argument is a scalar or a pointer to an array, dereference it. */ - else if (!sym->attr.dimension || sym->attr.pointer) + /* If the argument is a scalar, a pointer to an array or an allocatable, + dereference it. */ + else if (!sym->attr.dimension || sym->attr.pointer || sym->attr.allocatable) value = build_fold_indirect_ref (se->expr); /* For character(*), use the actual argument's descriptor. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 677fd31..98ece81 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-03-09 Erik Edelmann <eedelman@gcc.gnu.org> + + * gfortran.dg/allocatable_dummy_1.f90: Test for functions returning + arrays too. + 2006-03-09 Diego Novillo <dnovillo@redhat.com> * gcc/testsuite/g++.dg/gomp: New directory. diff --git a/gcc/testsuite/gfortran.dg/allocatable_dummy_1.f90 b/gcc/testsuite/gfortran.dg/allocatable_dummy_1.f90 index db65d71..bfa9ced 100644 --- a/gcc/testsuite/gfortran.dg/allocatable_dummy_1.f90 +++ b/gcc/testsuite/gfortran.dg/allocatable_dummy_1.f90 @@ -13,6 +13,8 @@ program alloc_dummy call useit(a, b) if (.NOT.all(b == [ 1, 2, 3 ])) call abort() + if (.NOT.all(whatever(a) == [ 1, 2, 3 ])) call abort() + call kill(a) if (allocated(a)) call abort() @@ -35,6 +37,13 @@ contains y = x end subroutine useit + function whatever(x) + integer, allocatable :: x(:) + integer :: whatever(size(x)) + + whatever = x + end function whatever + subroutine kill(x) integer, allocatable, intent(out) :: x(:) end subroutine kill |