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/mapping_2.f90 b/gcc/testsuite/gfortran.dg/mapping_2.f90
new file mode 100644
index 000000000..9104184a5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/mapping_2.f90
@@ -0,0 +1,32 @@
+! { dg-do run }
+! Tests the fix for PR33998, in which the chain of expressions
+! determining the character length of my_string were not being
+! resolved by the formal to actual mapping.
+!
+! Contributed by Tobias Burnus <burnus@gcc.gnu.org>
+!
+module test
+   implicit none
+   contains
+      function my_string(x)
+         integer i
+         real, intent(in) :: x(:)
+         character(0) h4(1:minval([(i,i=30,32), 15]))
+         character(0) sv1(size(x,1):size(h4))
+         character(0) sv2(2*lbound(sv1,1):size(h4))
+         character(lbound(sv2,1)-3) my_string
+
+         do i = 1, len(my_string)
+            my_string(i:i) = achar(modulo(i-1,10)+iachar('0'))
+         end do
+      end function my_string
+end module test
+
+program len_test
+   use test
+   implicit none
+   real x(7)
+
+   if (my_string(x) .ne. "01234567890") call abort ()
+end program len_test
+! { dg-final { cleanup-modules "test" } }