git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/78592 (ICE in gfc_find_specific_dtio_proc, at fortran/interface.c:4939) 

2016-12-18  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/78592
	* interfac.c (gfc_find_specific_dtio_proc): Fixup for r243005, making
	sure that the generic list is followed through until the end.

2016-12-18  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/78592
	* gfortran.dg/dtio_21.f90: New test.

From-SVN: r243783
This commit is contained in:
Janus Weil 2016-12-18 12:03:41 +01:00
parent ab5d223376
commit 413e859cdf
4 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/fortran/ChangeLog
View File

@ -1,9 +1,13 @@
2016-12-18 Janus Weil <janus@gcc.gnu.org>
PR fortran/78592
* interfac.c (gfc_find_specific_dtio_proc): Fixup for r243005, making
sure that the generic list is followed through until the end.
2016-12-17 Thomas Koenig <tkoenig@gcc.gnu.org> 2016-12-17 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/78239 PR fortran/78239
* decl.c (char_len_param_value): Actually commit * decl.c (char_len_param_value): Actually commit previous change.
previous change.
2016-12-17 Thomas Koenig <tkoenig@gcc.gnu.org> 2016-12-17 Thomas Koenig <tkoenig@gcc.gnu.org>

20
gcc/fortran/interface.c
View File

@ -4949,17 +4949,19 @@ gfc_find_specific_dtio_proc (gfc_symbol *derived, bool write, bool formatted)
&& tb_io_st->n.sym->generic) && tb_io_st->n.sym->generic)
{ {
for (gfc_interface *intr = tb_io_st->n.sym->generic; for (gfc_interface *intr = tb_io_st->n.sym->generic;
intr && intr->sym && intr->sym->formal; intr && intr->sym; intr = intr->next)
intr = intr->next)
{ {
gfc_symbol *fsym = intr->sym->formal->sym; if (intr->sym->formal)
if ((fsym->ts.type == BT_CLASS
&& CLASS_DATA (fsym)->ts.u.derived == extended)
|| (fsym->ts.type == BT_DERIVED
&& fsym->ts.u.derived == extended))
{ {
dtio_sub = intr->sym; gfc_symbol *fsym = intr->sym->formal->sym;
break; if ((fsym->ts.type == BT_CLASS
&& CLASS_DATA (fsym)->ts.u.derived == extended)
|| (fsym->ts.type == BT_DERIVED
&& fsym->ts.u.derived == extended))
{
dtio_sub = intr->sym;
break;
}
} }
} }
} }

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2016-12-18 Janus Weil <janus@gcc.gnu.org>
PR fortran/78592
* gfortran.dg/dtio_21.f90: New test.
2016-12-17 Steven G. Kargl <kargl@gcc.gnu.org> 2016-12-17 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/78746 PR fortran/78746

30
gcc/testsuite/gfortran.dg/dtio_21.f90 Normal file
View File

@ -0,0 +1,30 @@
! { dg-do compile }
!
! PR 78592: [7 Regression] ICE in gfc_find_specific_dtio_proc, at fortran/interface.c:4939
!
! Contributed by Mikael Morin <morin-mikael@orange.fr>
program p
type t
end type
type(t) :: z
type, extends(t) :: t2
end type
class(t2), allocatable :: z2
interface write(formatted)
procedure wf2
module procedure wf ! { dg-error "is neither function nor subroutine" }
end interface
print *, z
allocate(z2)
print *, z2
contains
subroutine wf2(this, a, b, c, d, e)
class(t2), intent(in) :: this
integer, intent(in) :: a
character, intent(in) :: b
integer, intent(in) :: c(:)
integer, intent(out) :: d
character, intent(inout) :: e
end subroutine wf2
end