mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 23:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/60231 (ICE on undefined generic)

Browse Source 
2014-02-18  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/60231
	* resolve.c (check_generic_tbp_ambiguity): Check for presence of dummy
	arguments to prevent ICE.


2014-02-18  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/60231
	* gfortran.dg/typebound_generic_15.f90: New.

From-SVN: r207836
This commit is contained in:
Janus Weil 2014-02-18 08:45:39 +01:00
parent d0b50387bc
commit 2a144f64c9
4 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2014-02-18 Janus Weil <janus@gcc.gnu.org>
PR fortran/60231
* resolve.c (check_generic_tbp_ambiguity): Check for presence of dummy
arguments to prevent ICE.
2014-02-17 Janus Weil <janus@gcc.gnu.org>
PR fortran/55907

21
gcc/fortran/resolve.c
View File

@ -11362,6 +11362,7 @@ check_generic_tbp_ambiguity (gfc_tbp_generic* t1, gfc_tbp_generic* t2,
{
gfc_symbol *sym1, *sym2;
const char *pass1, *pass2;
gfc_formal_arglist *dummy_args;
gcc_assert (t1->specific && t2->specific);
gcc_assert (!t1->specific->is_generic);
@ -11384,19 +11385,33 @@ check_generic_tbp_ambiguity (gfc_tbp_generic* t1, gfc_tbp_generic* t2,
return false;
}
/* Compare the interfaces. */
/* Determine PASS arguments. */
if (t1->specific->nopass)
pass1 = NULL;
else if (t1->specific->pass_arg)
pass1 = t1->specific->pass_arg;
else
pass1 = gfc_sym_get_dummy_args (t1->specific->u.specific->n.sym)->sym->name;
{
dummy_args = gfc_sym_get_dummy_args (t1->specific->u.specific->n.sym);
if (dummy_args)
pass1 = dummy_args->sym->name;
else
pass1 = NULL;
}
if (t2->specific->nopass)
pass2 = NULL;
else if (t2->specific->pass_arg)
pass2 = t2->specific->pass_arg;
else
pass2 = gfc_sym_get_dummy_args (t2->specific->u.specific->n.sym)->sym->name;
{
dummy_args = gfc_sym_get_dummy_args (t2->specific->u.specific->n.sym);
if (dummy_args)
pass2 = dummy_args->sym->name;
else
pass2 = NULL;
}
/* Compare the interfaces. */
if (gfc_compare_interfaces (sym1, sym2, sym2->name, !t1->is_operator, 0,
NULL, 0, pass1, pass2))
{

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2014-02-18 Janus Weil <janus@gcc.gnu.org>
PR fortran/60231
* gfortran.dg/typebound_generic_15.f90: New.
2014-02-17 Janus Weil <janus@gcc.gnu.org>
PR fortran/55907

18
gcc/testsuite/gfortran.dg/typebound_generic_15.f90 Normal file
View File

@ -0,0 +1,18 @@
! { dg-do compile }
!
! PR 60231: [4.8/4.9 Regression] ICE on undefined generic
!
! Contributed by Antony Lewis <antony@cosmologist.info>
module Objects
Type TObjectList
contains
procedure :: Add1 ! { dg-error "must be a module procedure" }
procedure :: Add2 ! { dg-error "must be a module procedure" }
generic :: Add => Add1, Add2 ! { dg-error "are ambiguous" }
end Type
end module
! { dg-final { cleanup-modules "Objects" } }