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/used_types_2.f90 b/gcc/testsuite/gfortran.dg/used_types_2.f90
new file mode 100644
index 000000000..b1870d12b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/used_types_2.f90
@@ -0,0 +1,34 @@
+! { dg-do compile }
+! Tests the fix for PR28630, in which a contained,
+! derived type function caused an ICE if its definition
+! was both host and use associated.
+!
+! Contributed by Mark Hesselink <mhesseli@alumni.caltech.edu>
+!
+MODULE types
+   TYPE :: t
+      INTEGER :: i
+   END TYPE
+END MODULE types
+
+MODULE foo
+   USE types
+CONTAINS
+   FUNCTION bar (x) RESULT(r)
+      USE types
+      REAL, INTENT(IN) :: x
+      TYPE(t) :: r
+      r = t(0)
+   END FUNCTION bar
+END MODULE
+
+
+LOGICAL FUNCTION foobar (x)
+   USE foo
+   REAL, INTENT(IN) :: x
+   TYPE(t) :: c
+   foobar = .FALSE.
+   c = bar (x)
+END FUNCTION foobar
+! { dg-final { cleanup-modules "types foo" } }
+