r111742 - in /branches/gcc-4_1-branch/gcc: fort...

[tkoenig@gcc.gnu.org]

Author: tkoenig
Date: Sun Mar  5 20:03:08 2006
New Revision: 111742

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=111742
Log:
2006-03-05  Thomas Koenig <Thomas.Koenig@online.de>

	PR fortran/23092
	backport from mainline
	* trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc):
	If the mask expression exists and has rank 0, enclose the
	generated loop in an "if (mask)".  Put the default
	initialization into the else branch.
	* trans-intrinsic.c (gfc_conv_intrinsic_arith):  If the
	mask expression exists and has rank 0, enclose the generated
	loop in an "if (mask)".
	* (gfc_conv_intrinsic_minmaxloc):  Likewise.

2006-03-05  Thomas Koenig  <Thomas.Koenig@online.de>

	PR fortran/23092
	backport from mainline
	* gfortran.dg/scalar_mask_1.f90:  New test.



Added:
    branches/gcc-4_1-branch/gcc/testsuite/gfortran.dg/scalar_mask_1.f90
Modified:
    branches/gcc-4_1-branch/gcc/fortran/ChangeLog
    branches/gcc-4_1-branch/gcc/fortran/trans-intrinsic.c
    branches/gcc-4_1-branch/gcc/testsuite/ChangeLog