obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 51 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_result_6.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_result_6.f90
new file mode 100644
index 000000000..c9e1a8b06
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_result_6.f90
@@ -0,0 +1,51 @@
+! { dg-do run }
+!
+! PR 40593: Proc-pointer returning function as actual argument
+!
+! Original test case by Tobias Burnus <burnus@gcc.gnu.org>
+! Modified by Janus Weil
+
+module m
+contains
+  subroutine sub(a)
+    integer :: a
+    a = 42
+  end subroutine
+  integer function func()
+    func = 42
+  end function
+end module m
+
+program test
+  use m
+  implicit none
+  call caller1(getPtr1())
+  call caller2(getPtr2())
+  call caller3(getPtr2())
+contains
+  subroutine caller1(s)
+    procedure(sub) :: s
+    integer :: b
+    call s(b)
+    if (b /= 42)  call abort()
+  end subroutine
+  subroutine caller2(f)
+    procedure(integer) :: f
+    if (f() /= 42)  call abort()
+  end subroutine
+  subroutine caller3(f)
+    procedure(func),pointer :: f
+    if (f() /= 42) call abort()
+  end subroutine
+  function getPtr1()
+    procedure(sub), pointer :: getPtr1
+    getPtr1 => sub
+  end function
+  function getPtr2()
+    procedure(func), pointer :: getPtr2
+    getPtr2 => func
+  end function
+end program test
+
+! { dg-final { cleanup-modules "m" } }
+