diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c574dc42f23..73dcf0e57f2 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-05  Roger Sayle  <roger@eyesopen.com>
+
+	* trans-array.c (gfc_conv_loop_setup):  Test whether the loop
+	stride is one, to avoid fold_build2 introducing a useless
+	NON_LVALUE_EXPR node.
+
 2007-01-05  Tobias Burnus  <burnus@net-b.de>
 
 	* symbol.c (check_conflict): Fix error message.
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 10243fe5712..d6d3ff7eff0 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -3141,8 +3141,10 @@ gfc_conv_loop_setup (gfc_loopinfo * loop)
 	    {
 	      /* Calculate the offset relative to the loop variable.
 	         First multiply by the stride.  */
-	      tmp = fold_build2 (MULT_EXPR, gfc_array_index_type,
-				 loop->from[n], info->stride[n]);
+	      tmp = loop->from[n];
+	      if (!integer_onep (info->stride[n]))
+		tmp = fold_build2 (MULT_EXPR, gfc_array_index_type,
+				   tmp, info->stride[n]);
 
 	      /* Then subtract this from our starting value.  */
 	      tmp = fold_build2 (MINUS_EXPR, gfc_array_index_type,