decl.c (match_procedure_in_type): Assertify if conditions.

2010-10-06  Mikael Morin  <mikael@gcc.gnu.org>

	* decl.c (match_procedure_in_type): Assertify if conditions.

From-SVN: r165026
This commit is contained in:
Mikael Morin 2010-10-06 14:11:30 +00:00
parent 35c2682003
commit c9ab240e0c
2 changed files with 9 additions and 6 deletions

View File

@ -1,3 +1,7 @@
2010-10-06 Mikael Morin <mikael@gcc.gnu.org>
* decl.c (match_procedure_in_type): Assertify if conditions.
2010-10-06 Mikael Morin <mikael@gcc.gnu.org>
* cpp.c (gfc_cpp_post_options): Don't create a cpp reader if

View File

@ -7916,8 +7916,9 @@ match_procedure_in_type (void)
would be an error. If a GENERIC already targetted this binding, it may
be already there but then typebound is still NULL. */
stree = gfc_find_symtree (ns->tb_sym_root, name);
if (stree && stree->n.tb)
if (stree)
{
gcc_assert (stree->n.tb);
gfc_error ("There is already a procedure with binding name '%s' for "
"the derived type '%s' at %C", name, block->name);
return MATCH_ERROR;
@ -7925,11 +7926,9 @@ match_procedure_in_type (void)
/* Insert it and set attributes. */
if (!stree)
{
stree = gfc_new_symtree (&ns->tb_sym_root, name);
gcc_assert (stree);
}
gcc_assert (!stree);
stree = gfc_new_symtree (&ns->tb_sym_root, name);
gcc_assert (stree);
stree->n.tb = gfc_get_typebound_proc (&tb);
if (gfc_get_sym_tree (target, gfc_current_ns, &stree->n.tb->u.specific,