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

diff --git a/gcc/testsuite/gfortran.dg/interface_derived_type_1.f90 b/gcc/testsuite/gfortran.dg/interface_derived_type_1.f90
new file mode 100644
index 000000000..a2c4d02be
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/interface_derived_type_1.f90
@@ -0,0 +1,56 @@
+! { dg-do compile }
+! Test the fix for PR20903, in which derived types could be host associated within
+! interface bodies.
+!
+! Contributed by Joost VandeVondele <jv244@cam.ac.uk>
+! 
+module test
+  implicit none
+  type fcnparms
+    integer :: i
+  end type fcnparms
+contains
+  subroutine sim_1(func1,params)
+    interface
+      function func1(fparams)
+        type(fcnparms) :: fparams ! { dg-error "not been declared within the interface" }
+        real :: func1
+      end function func1
+    end interface
+    type(fcnparms)     :: params
+   end subroutine sim_1
+
+  subroutine sim_2(func2,params)
+    interface
+      function func2(fparams)     ! This is OK because of the derived type decl.
+        type fcnparms
+          integer :: i
+        end type fcnparms
+        type(fcnparms)  :: fparams
+        real :: func2
+      end function func2
+    end interface
+    type(fcnparms)      :: params ! This is OK, of course
+   end subroutine sim_2
+end module  test
+
+module type_decl
+  implicit none
+  type fcnparms
+    integer :: i
+  end type fcnparms
+end module type_decl
+
+subroutine sim_3(func3,params)
+  use type_decl
+  interface
+    function func3(fparams)
+      use type_decl
+      type(fcnparms)   :: fparams ! This is OK - use associated
+      real :: func3
+    end function func3
+  end interface
+  type(fcnparms)       :: params  !         -ditto-
+end subroutine sim_3
+
+! { dg-final { cleanup-modules "test type_decl" } }