re PR fortran/56968 ([F03] Issue with a procedure defined with a generic name…

re PR fortran/56968 ([F03] Issue with a procedure defined with a generic name returning procedure pointer)

2013-04-16  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/56968
	* expr.c (gfc_check_pointer_assign): Handle generic functions returning
	procedure pointers.


2013-04-16  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/56968
	* gfortran.dg/proc_ptr_41.f90: New.

From-SVN: r198008

gcc/fortran/ChangeLog

+2013-04-16  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/56968
+	* expr.c (gfc_check_pointer_assign): Handle generic functions returning
+	procedure pointers.
+
 2013-04-16  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/56969

gcc/fortran/expr.c

@@ -3540,7 +3540,11 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue)
 	}
       else if (rvalue->expr_type == EXPR_FUNCTION)
 	{
-	  s2 = rvalue->symtree->n.sym->result;
+	  if (rvalue->value.function.esym)
+	    s2 = rvalue->value.function.esym->result;
+	  else
+	    s2 = rvalue->symtree->n.sym->result;
+
 	  name = s2->name;
 	}
       else

gcc/testsuite/ChangeLog

+2013-04-16  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/56968
+	* gfortran.dg/proc_ptr_41.f90: New.
+
 2013-04-16  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/56756

gcc/testsuite/gfortran.dg/proc_ptr_41.f90

+! { dg-do compile }
+!
+! PR 56968: [4.7/4.8/4.9 Regression] [F03] Issue with a procedure defined with a generic name returning procedure pointer
+!
+! Contributed by Samuel Debionne <samuel.debionne@ujf-grenoble.fr>
+
+module test
+
+  interface generic_name_get_proc_ptr
+    module procedure specific_name_get_proc_ptr
+  end interface
+
+  abstract interface
+    double precision function foo(arg1)
+      real, intent(in) :: arg1
+    end function
+  end interface
+
+contains
+
+  function specific_name_get_proc_ptr() result(res)
+    procedure(foo), pointer :: res
+  end function
+
+end module test
+
+program crash_test
+    use :: test
+
+    procedure(foo), pointer :: ptr
+
+    ptr => specific_name_get_proc_ptr()
+    ptr => generic_name_get_proc_ptr()
+
+end program
+
+! { dg-final { cleanup-modules "test" } }