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

diff --git a/gcc/testsuite/gfortran.dg/char_length_7.f90 b/gcc/testsuite/gfortran.dg/char_length_7.f90
new file mode 100644
index 000000000..221c84090
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/char_length_7.f90
@@ -0,0 +1,32 @@
+! { dg-do run }
+! Test the fix for PR31879 in which the concatenation operators below
+! would cause ICEs because the character lengths were never resolved.
+!
+! Contributed by Vivek Rao <vivekrao4@yahoo.com> 
+!
+module str_mod
+  character(3) :: mz(2) = (/"fgh","ijk"/)
+contains
+  function ccopy(yy) result(xy)
+    character (len=*), intent(in) :: yy(:)
+    character (len=5) :: xy(size(yy))
+    xy = yy
+  end function ccopy
+end module str_mod
+!
+program xx
+  use str_mod, only: ccopy, mz
+  implicit none
+  character(2) :: z = "zz"
+  character(3) :: zz(2) = (/"abc","cde"/)
+  character(2) :: ans(2)
+  integer :: i = 2, j = 3
+  if (any(ccopy("_&_"//(/"A","B"/)//"?") .ne. (/"_&_A?","_&_B?"/))) call abort ()
+  if (any(ccopy(z//zz) .ne. (/"zzabc","zzcde"/))) call abort ()
+  if (any(ccopy(z//zz(:)(1:2)) .ne. (/"zzab ","zzcd "/))) call abort ()
+  if (any(ccopy(z//mz(:)(2:3)) .ne. (/"zzgh ","zzjk "/))) call abort ()
+
+! This was another bug, uncovered when the PR was fixed.
+  if (any(ccopy(z//mz(:)(i:j)) .ne. (/"zzgh ","zzjk "/))) call abort ()
+end program xx
+! { dg-final { cleanup-modules "str_mod" } }