re PR fortran/36426 (Endless loop in gfc_apply_interface_mapping_to_expr)

2008-11-01  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/36426
	* expr.c (replace_symbol): Replace all symbols which lie in the
	formal namespace of the interface and copy their attributes.
	* resolve.c (resolve_symbol): Add charlen to namespace.


2008-11-01  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/36426
	* gfortran.dg/proc_decl_19.f90: New.

From-SVN: r141522

gcc/fortran/ChangeLog

+2008-11-01  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/36426
+	* expr.c (replace_symbol): Replace all symbols which lie in the
+	formal namespace of the interface and copy their attributes.
+	* resolve.c (resolve_symbol): Add charlen to namespace.
+
 2008-11-01  Steven G. Kargl  <kargls@comcast.net>
 
 	PR fortran/19925

gcc/fortran/expr.c

@@ -3511,12 +3511,11 @@ static bool
 replace_symbol (gfc_expr *expr, gfc_symbol *sym, int *i ATTRIBUTE_UNUSED)
 {
   if ((expr->expr_type == EXPR_VARIABLE || expr->expr_type == EXPR_FUNCTION)
-      && expr->symtree->n.sym->ns != sym->formal_ns
-      && expr->symtree->n.sym->attr.dummy)
+      && expr->symtree->n.sym->ns == sym->ts.interface->formal_ns)
     {
       gfc_symtree *stree;
       gfc_get_sym_tree (expr->symtree->name, sym->formal_ns, &stree);
-      stree->n.sym->attr.referenced = expr->symtree->n.sym->attr.referenced;
+      stree->n.sym->attr = expr->symtree->n.sym->attr;
       expr->symtree = stree;
     }
   return false;

gcc/fortran/resolve.c

@@ -8939,6 +8939,12 @@ resolve_symbol (gfc_symbol *sym)
 	      sym->ts.cl->resolved = ifc->ts.cl->resolved;
 	      sym->ts.cl->length = gfc_copy_expr (ifc->ts.cl->length);
 	      gfc_expr_replace_symbols (sym->ts.cl->length, sym);
+	      /* Add charlen to namespace.  */
+	      if (sym->formal_ns)
+		{
+		  sym->ts.cl->next = sym->formal_ns->cl_list;
+		  sym->formal_ns->cl_list = sym->ts.cl;
+		}
 	    }
 	}
       else if (sym->ts.interface->name[0] != '\0')

gcc/testsuite/ChangeLog

+2008-11-01  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/36426
+	* gfortran.dg/proc_decl_19.f90: New.
+
 2008-11-01  Steven G. Kargl  <kargls@comcast.net>
 
 	PR fortran/19925

gcc/testsuite/gfortran.dg/proc_decl_19.f90

+! { dg-do compile }
+! 
+! PR 36426
+!
+! Contributed by Tobias Burnus <burnus@gcc.gnu.org>
+
+abstract interface
+  function foo(x)
+    character(len=*) :: x
+    character(len=len(x)) :: foo
+  end function foo
+end interface
+procedure(foo) :: bar
+
+abstract interface
+  character function abs_fun()
+  end function
+end interface
+procedure(abs_fun):: x
+
+character(len=20) :: str
+str = bar("Hello")
+end