[Patch, Fortran, OOP] PR 47601: Internal Error: mio_component_ref(): Component not found

[Janus Weil]

Hi all,

here is a fix for a problem, where the module loading could not handle
components of extended types. Regtested on x86_64-unknown-linux-gnu.
Ok for trunk?

Cheers,
Janus



2011-05-29  Janus Weil  <ja...@gcc.gnu.org>

        PR fortran/47601
        * module.c (mio_component_ref): Handle components of extended types.
        * symbol.c (gfc_find_component): Return is sym is NULL.

2011-05-29  Janus Weil  <ja...@gcc.gnu.org>

        PR fortran/47601
        * gfortran.dg/extends_13.f03: New.

Index: gcc/fortran/module.c
===================================================================
--- gcc/fortran/module.c	(revision 174380)
+++ gcc/fortran/module.c	(working copy)
@@ -2356,14 +2356,10 @@ mio_component_ref (gfc_component **cp, gfc_symbol
       if (sym->components != NULL && p->u.pointer == NULL)
 	{
 	  /* Symbol already loaded, so search by name.  */
-	  for (q = sym->components; q; q = q->next)
-	    if (strcmp (q->name, name) == 0)
-	      break;
+	  q = gfc_find_component (sym, name, true, true);
 
-	  if (q == NULL)
-	    gfc_internal_error ("mio_component_ref(): Component not found");
-
-	  associate_integer_pointer (p, q);
+	  if (q)
+	    associate_integer_pointer (p, q);
 	}
 
       /* Make sure this symbol will eventually be loaded.  */
Index: gcc/fortran/symbol.c
===================================================================
--- gcc/fortran/symbol.c	(revision 174380)
+++ gcc/fortran/symbol.c	(working copy)
@@ -1996,7 +1996,7 @@ gfc_find_component (gfc_symbol *sym, const char *n
 {
   gfc_component *p;
 
-  if (name == NULL)
+  if (name == NULL || sym == NULL)
     return NULL;
 
   sym = gfc_use_derived (sym);

extends_13.f03
Description: Binary data