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

diff --git a/gcc/testsuite/gfortran.dg/derived_function_interface_1.f90 b/gcc/testsuite/gfortran.dg/derived_function_interface_1.f90
new file mode 100644
index 000000000..b7ee4df89
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/derived_function_interface_1.f90
@@ -0,0 +1,45 @@
+! { dg-do compile }
+! Tests the fix for PR29634, in which an ICE would occur in the
+! interface declaration of a function with an 'old-style' type
+! declaration.  When fixed, it was found that the error message
+! was not very helpful - this was fixed.
+!
+! Contributed by Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+!
+module kinds
+  type foo
+    integer :: i
+  end type foo
+end module
+
+type(foo) function ext_fun()
+  use kinds
+  ext_fun%i = 1
+end function ext_fun
+
+  use kinds
+
+  interface fun_interface
+    type(foo) function fun()
+      use kinds
+    end function fun
+  end interface
+
+  interface ext_fun_interface
+    type(foo) function ext_fun()
+      use kinds
+    end function ext_fun
+  end interface
+
+  type(foo) :: x
+
+  x = ext_fun ()
+  print *, x%i
+
+contains
+
+  type(foo) function fun() ! { dg-error "already has an explicit interface" }
+  end function fun  ! { dg-error "Expecting END PROGRAM" }
+
+end
+! { dg-final { cleanup-modules "kinds" } }