From 2fa85cc4fe1d11f5a344a3a0eba5f3fc8fac1d49 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <burnus@gcc.gnu.org>
Date: Sat, 19 Feb 2011 12:27:52 +0100
Subject: [PATCH] 2011-02-19  Tobias Burnus

        PR fortran/47775
        * trans-expr.c (arrayfunc_assign_needs_temporary): Use
        esym to check whether the specific procedure returns an
        allocatable or pointer.

2011-02-19  Tobias Burnus

        PR fortran/47775
        * gfortran.dg/func_result_6.f90: New.

From-SVN: r170312
---
 gcc/fortran/ChangeLog                       |  7 ++
 gcc/fortran/trans-expr.c                    | 10 ++-
 gcc/testsuite/ChangeLog                     |  5 ++
 gcc/testsuite/gfortran.dg/func_result_6.f90 | 73 +++++++++++++++++++++
 4 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/func_result_6.f90

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b5e0c2a49f8e..41fc97d058cb 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-19  Tobias Burnus
+
+	PR fortran/47775
+	* trans-expr.c (arrayfunc_assign_needs_temporary): Use
+	esym to check whether the specific procedure returns an
+	allocatable or pointer.
+
 2011-02-14  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/47569
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index a68cfdcc50ce..dd6709e58910 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -4405,9 +4405,13 @@ arrayfunc_assign_needs_temporary (gfc_expr * expr1, gfc_expr * expr2)
   if (gfc_ref_needs_temporary_p (expr1->ref))
     return true;
 
-  /* Functions returning pointers need temporaries.  */
-  if (expr2->symtree->n.sym->attr.pointer 
-      || expr2->symtree->n.sym->attr.allocatable)
+  /* Functions returning pointers or allocatables need temporaries.  */
+  c = expr2->value.function.esym
+      ? (expr2->value.function.esym->attr.pointer 
+	 || expr2->value.function.esym->attr.allocatable)
+      : (expr2->symtree->n.sym->attr.pointer
+	 || expr2->symtree->n.sym->attr.allocatable);
+  if (c)
     return true;
 
   /* Character array functions need temporaries unless the
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2863f91962ed..19146f9ca383 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-19  Tobias Burnus
+
+	PR fortran/47775
+	* gfortran.dg/func_result_6.f90: New.
+
 2011-02-17  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/43653
diff --git a/gcc/testsuite/gfortran.dg/func_result_6.f90 b/gcc/testsuite/gfortran.dg/func_result_6.f90
new file mode 100644
index 000000000000..e64a2ef7abc8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/func_result_6.f90
@@ -0,0 +1,73 @@
+! { dg-do run }
+!
+! PR fortran/47775
+!
+! Contributed by Fran Martinez Fadrique
+!
+! Before, a temporary was missing for generic procedured (cf. test())
+! as the allocatable attribute was ignored for the check whether a
+! temporary is required
+!
+module m
+type t
+contains
+  procedure, NOPASS :: foo => foo
+  generic :: gen => foo
+end type t
+contains
+  function foo(i)
+    integer, allocatable :: foo(:)
+    integer :: i
+    allocate(foo(2))
+    foo(1) = i
+    foo(2) = i + 10
+  end function foo
+end module m
+
+use m
+type(t) :: x
+integer, pointer :: ptr1, ptr2
+integer, target              :: bar1(2)
+integer, target, allocatable :: bar2(:)
+
+allocate(bar2(2))
+ptr1 => bar1(2)
+ptr2 => bar2(2)
+
+bar1 = x%gen(1)
+if (ptr1 /= 11) call abort()
+bar1 = x%foo(2)
+if (ptr1 /= 12) call abort()
+bar2 = x%gen(3)
+if (ptr2 /= 13) call abort()
+bar2 = x%foo(4)
+if (ptr2 /= 14) call abort()
+bar2(:) = x%gen(5)
+if (ptr2 /= 15) call abort()
+bar2(:) = x%foo(6)
+if (ptr2 /= 16) call abort()
+
+call test()
+end
+
+subroutine test
+interface gen
+  procedure foo
+end interface gen
+
+integer, target :: bar(2)
+integer, pointer :: ptr
+bar = [1,2]
+ptr => bar(2)
+if (ptr /= 2) call abort()
+bar = gen()
+if (ptr /= 77) call abort()
+contains
+  function foo()
+    integer, allocatable :: foo(:)
+    allocate(foo(2))
+    foo = [33, 77]
+  end function foo
+end subroutine test
+
+! { dg-final { cleanup-modules "m" } }
-- 
2.47.2