diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2008-06-04 23:04:32 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2008-06-04 23:04:32 +0200 |
| commit | 7db5da56edab33b9dc4ab1991ad06d023c9516b1 (patch) | |
| tree | aaf7d563098fc653c55f7e39fc0a07696b054878 /gcc | |
| parent | b30199b8c0f408ad954bacfffeb0d38b56e394c9 (diff) | |
| download | gcc-7db5da56edab33b9dc4ab1991ad06d023c9516b1.zip gcc-7db5da56edab33b9dc4ab1991ad06d023c9516b1.tar.gz gcc-7db5da56edab33b9dc4ab1991ad06d023c9516b1.tar.bz2 | |
re PR fortran/36322 (ICE with PROCEDURE using a complicated interface)
2008-06-04 Janus Weil <janus@gcc.gnu.org>
PR fortran/36322
PR fortran/36275
* resolve.c (resolve_symbol): Correctly copy the interface for a
PROCEDURE declaration.
2008-06-04 Janus Weil <janus@gcc.gnu.org>
PR fortran/36322
PR fortran/36275
* gfortran.dg/proc_decl_2.f90: Extended.
From-SVN: r136372
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/proc_decl_2.f90 | 20 |
4 files changed, 39 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fd0817b..826b409 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2008-06-04 Janus Weil <janus@gcc.gnu.org> + + PR fortran/36322 + PR fortran/36275 + * resolve.c (resolve_symbol): Correctly copy the interface for a + PROCEDURE declaration. + 2008-06-02 Janus Weil <janus@gcc.gnu.org> PR fortran/36361 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index c980935..b5b76b6 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -7893,11 +7893,12 @@ resolve_symbol (gfc_symbol *sym) /* Get the attributes from the interface (now resolved). */ if (sym->ts.interface->attr.if_source || sym->ts.interface->attr.intrinsic) { - sym->ts.type = sym->ts.interface->ts.type; - sym->ts.kind = sym->ts.interface->ts.kind; - sym->attr.function = sym->ts.interface->attr.function; - sym->attr.subroutine = sym->ts.interface->attr.subroutine; - copy_formal_args (sym, sym->ts.interface); + gfc_symbol *ifc = sym->ts.interface; + sym->ts = ifc->ts; + sym->ts.interface = ifc; + sym->attr.function = ifc->attr.function; + sym->attr.subroutine = ifc->attr.subroutine; + copy_formal_args (sym, ifc); } else if (sym->ts.interface->name[0] != '\0') { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a2f746c..14414d9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-06-04 Janus Weil <janus@gcc.gnu.org> + + PR fortran/36322 + PR fortran/36275 + * gfortran.dg/proc_decl_2.f90: Extended. + 2008-06-04 Joseph Myers <joseph@codesourcery.com> Maxim Kuvyrkov <maxim@codesourcery.com> diff --git a/gcc/testsuite/gfortran.dg/proc_decl_2.f90 b/gcc/testsuite/gfortran.dg/proc_decl_2.f90 index 6edc6bd..a16b4db 100644 --- a/gcc/testsuite/gfortran.dg/proc_decl_2.f90 +++ b/gcc/testsuite/gfortran.dg/proc_decl_2.f90 @@ -4,16 +4,27 @@ module m + use ISO_C_BINDING + abstract interface subroutine csub() bind(c) end subroutine csub end interface + integer, parameter :: ckind = C_FLOAT_COMPLEX + abstract interface + function stub() bind(C) + import ckind + complex(ckind) stub + end function + end interface + procedure():: mp1 procedure(real), private:: mp2 procedure(mfun), public:: mp3 procedure(csub), public, bind(c) :: c, d procedure(csub), public, bind(c, name="myB") :: b + procedure(stub), bind(C) :: e contains @@ -32,6 +43,15 @@ contains procedure(a), optional :: b end subroutine bar + subroutine bar2(x) + abstract interface + character function abs_fun() + end function + end interface + procedure(abs_fun):: x + end subroutine + + end module |