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

diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/where_1.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/where_1.f90
new file mode 100644
index 000000000..ba1f8a625
--- /dev/null
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/where_1.f90
@@ -0,0 +1,41 @@
+! Program to test WHERE inside FORALL
+program where_1
+   integer :: A(5,5)
+
+   A(1,:) = (/1,0,0,0,0/)
+   A(2,:) = (/2,1,1,1,0/)
+   A(3,:) = (/1,2,2,0,2/)
+   A(4,:) = (/2,1,0,2,3/)
+   A(5,:) = (/1,0,0,0,0/)
+
+   ! Where inside FORALL.
+   ! WHERE masks must be evaluated before executing the assignments
+   forall (I=1:5)
+      where (A(I,:) .EQ. 0)
+         A(:,I) = I
+      elsewhere (A(I,:) >2)
+         A(I,:) = 6
+      endwhere
+   end forall
+
+   if (any (A .ne. reshape ((/1, 1, 1, 1, 1, 0, 1, 2, 1, 2, 0, 1, 2, 3, 0, &
+      0, 1, 4, 2, 0, 0, 5, 6, 6, 5/), (/5, 5/)))) call abort
+
+   ! Where inside DO
+   A(1,:) = (/1,0,0,0,0/)
+   A(2,:) = (/2,1,1,1,0/)
+   A(3,:) = (/1,2,2,0,2/)
+   A(4,:) = (/2,1,0,2,3/)
+   A(5,:) = (/1,0,0,0,0/)
+
+   do I=1,5
+      where (A(I,:) .EQ. 0)
+         A(:,I) = I
+      elsewhere (A(I,:) >2)
+         A(I,:) = 6
+      endwhere
+   enddo
+
+   if (any (A .ne. reshape ((/1, 1, 1, 1, 1, 0, 1, 2, 1, 2, 0, 1, 2, 6, 0, &
+      0, 1, 0, 2, 0, 0, 0, 5, 5, 5/), (/5, 5/)))) call abort
+end