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

diff --git a/gcc/testsuite/gfortran.dg/derived_constructor_comps_1.f90 b/gcc/testsuite/gfortran.dg/derived_constructor_comps_1.f90
new file mode 100644
index 000000000..83d127931
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/derived_constructor_comps_1.f90
@@ -0,0 +1,57 @@
+! { dg-do run }
+!
+! Tests fix for PR28425 in which anything other than a constructor would
+! not work for derived type components in a structure constructor.
+!
+! Original version sent by Vivek Rao on 18 Jan 06
+! Modified by Steve Kargl to remove IO
+!
+module foo_mod
+
+  implicit none
+
+  type :: date_m
+     integer :: month
+  end type date_m
+
+  type :: file_info
+     type(date_m) :: date
+  end type file_info
+
+end module foo_mod
+
+program prog
+
+  use foo_mod
+
+  implicit none
+  type(date_m)  :: dat
+  type(file_info) :: xx
+
+  type(date_m), parameter :: christmas = date_m (12)
+
+  dat = date_m(1)
+
+  xx = file_info(date_m(-1))  ! This always worked - a constructor
+  if (xx%date%month /= -1) call abort
+
+  xx = file_info(dat)         ! This was the original PR - a variable
+  if (xx%date%month /= 1) call abort
+
+  xx = file_info(foo(2))      ! ...functions were also broken
+  if (xx%date%month /= 2) call abort
+
+  xx = file_info(christmas)   ! ...and parameters
+  if (xx%date%month /= 12) call abort
+
+
+contains
+
+  function foo (i) result (ans)
+     integer :: i
+     type(date_m) :: ans
+     ans = date_m(i)
+  end function foo
+
+end program prog
+! { dg-final { cleanup-modules "foo_mod" } }