diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2009-04-28 18:27:27 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2009-04-28 18:27:27 +0200 |
| commit | e6a5e544f7a09a9de801024cc2cb4e279a81ceb7 (patch) | |
| tree | 04c26c72395dc14b75ce551de016d86b1e6690cc | |
| parent | f1028b9da4ea5614c012d87c928e68300cd786b6 (diff) | |
| download | gcc-e6a5e544f7a09a9de801024cc2cb4e279a81ceb7.zip gcc-e6a5e544f7a09a9de801024cc2cb4e279a81ceb7.tar.gz gcc-e6a5e544f7a09a9de801024cc2cb4e279a81ceb7.tar.bz2 | |
re PR fortran/39946 (PROCEDURE statements: interface with RESULT variable)
2009-04-28 Janus Weil <janus@gcc.gnu.org>
PR fortran/39946
* resolve.c (resolve_symbol): Correctly copy the interface of a
PROCEDURE statement if the interface involves a RESULT variable.
2009-04-28 Janus Weil <janus@gcc.gnu.org>
PR fortran/39946
* gfortran.dg/proc_ptr_16.f90: New.
From-SVN: r146905
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/proc_ptr_16.f90 | 20 |
4 files changed, 35 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6db3325..e60eca6 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2009-04-28 Janus Weil <janus@gcc.gnu.org> + PR fortran/39946 + * resolve.c (resolve_symbol): Correctly copy the interface of a + PROCEDURE statement if the interface involves a RESULT variable. + +2009-04-28 Janus Weil <janus@gcc.gnu.org> + PR fortran/39930 PR fortran/39931 * expr.c (gfc_check_pointer_assign): Correctly detect if the left hand diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 7507869..fe79e4a 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9244,7 +9244,10 @@ resolve_symbol (gfc_symbol *sym) if (ifc->attr.intrinsic) resolve_intrinsic (ifc, &ifc->declared_at); - sym->ts = ifc->ts; + if (ifc->result) + sym->ts = ifc->result->ts; + else + sym->ts = ifc->ts; sym->ts.interface = ifc; sym->attr.function = ifc->attr.function; sym->attr.subroutine = ifc->attr.subroutine; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ebfcff9..024998b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-04-28 Janus Weil <janus@gcc.gnu.org> + + PR fortran/39946 + * gfortran.dg/proc_ptr_16.f90: New. + 2009-04-28 Steve Ellcey <sje@cup.hp.com> * testsuite/gcc.target/ia64/sync-1.c: Check for cmpxchg8 only if diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_16.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_16.f90 new file mode 100644 index 0000000..904b550 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/proc_ptr_16.f90 @@ -0,0 +1,20 @@ +! { dg-do compile } +! +! PR 39946: PROCEDURE statements: interface with RESULT variable +! +! Original test case by Juergen Reuter <reuter@physik.uni-freiburg.de> +! Modified by Janus Weil <janus@gcc.gnu.org> + + procedure(prc_is_allowed), pointer :: fptr + + interface + function prc_is_allowed (flv, hel, col) result (is_allowed) + logical :: is_allowed + integer, intent(in) :: flv, hel, col + end function prc_is_allowed + end interface + + fptr => prc_is_allowed + +end + |