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, 34 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/dummy_procedure_2.f90 b/gcc/testsuite/gfortran.dg/dummy_procedure_2.f90
new file mode 100644
index 000000000..b58980863
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dummy_procedure_2.f90
@@ -0,0 +1,34 @@
+! { dg-do compile }
+! Checks the fix for the bug exposed in fixing PR25147
+!
+! Contributed by Tobias Schlueter  <tobi@gcc.gnu.org>
+!
+module integrator
+  interface
+     function integrate(f,xmin,xmax)
+       implicit none
+       interface
+          function f(x)
+            real(8) :: f,x
+            intent(in) :: x
+          end function f
+       end interface
+       real(8) :: xmin, xmax, integrate
+     end function integrate
+  end interface
+end module integrator
+
+  use integrator
+  call foo1 ()
+  call foo2 ()
+contains
+  subroutine foo1 ()
+    real(8) :: f                   ! This was not trapped: PR25147/25098
+    print *,integrate (f,0d0,3d0) ! { dg-error "Expected a procedure" }
+  end subroutine foo1
+  subroutine foo2 ()
+    real(8), external :: g ! This would give an error, incorrectly.
+    print *,integrate (g,0d0,3d0)
+  end subroutine foo2
+end
+! { dg-final { cleanup-modules "integrator" } }