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

diff --git a/gcc/testsuite/gfortran.dg/array_constructor_17.f90 b/gcc/testsuite/gfortran.dg/array_constructor_17.f90
new file mode 100644
index 000000000..3ce7a9183
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/array_constructor_17.f90
@@ -0,0 +1,40 @@
+! { dg-do run }
+! Tests the fix for PR31219, in which the character length of
+! the functions in the array constructor was not being obtained
+! correctly and this caused an ICE.
+!
+! Contributed by Joost VandeVondele <jv244@cam.ac.uk>
+!
+  INTEGER :: J
+  CHARACTER(LEN = 8) :: str
+  J = 3
+  write (str,'(2A4)') (/( F(I, J), I = 1, 2)/)
+  IF (str .NE. " ODD EVE") call abort ()
+
+! Comment #1 from F-X Coudert (noted by T. Burnus) that
+! actually exercises a different part of the bug.
+  call gee( (/g (3)/) )
+
+CONTAINS
+  FUNCTION F (K,J) RESULT(I)
+    INTEGER :: K, J
+    CHARACTER(LEN = J) :: I
+    IF (MODULO (K, 2) .EQ. 0) THEN
+       I = "EVEN"
+    ELSE
+       I = "ODD"
+    ENDIF
+  END FUNCTION
+
+  function g(k) result(i)
+    integer :: k
+    character(len = k) :: i
+    i = '1234'
+  end function
+  subroutine gee(a)
+    character(*),dimension(1) :: a
+    if(len (a) /= 3) call abort ()
+    if(a(1) /= '123') call abort ()
+  end subroutine gee
+
+END