From: Roger Sayle <roger@eyesopen.com>
Date: Mon, 18 Dec 2006 19:34:23 +0000 (+0000)
Subject: trans-array.c (gfc_conv_array_index_offset): Avoid multiplying index by one, or addin... 
X-Git-Tag: releases/gcc-4.3.0~7924
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecc54e6eab98f1275218af1e7ed2c3aaa81ed456;p=thirdparty%2Fgcc.git

trans-array.c (gfc_conv_array_index_offset): Avoid multiplying index by one, or adding zero to it.


	* trans-array.c (gfc_conv_array_index_offset): Avoid multiplying
	index by one, or adding zero to it.

From-SVN: r120011
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a7e26077f852..7bf9577d7360 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-18  Roger Sayle  <roger@eyesopen.com>
+
+	* trans-array.c (gfc_conv_array_index_offset): Avoid multiplying
+	index by one, or adding zero to it.
+
 2006-12-17  Roger Sayle  <roger@eyesopen.com>
 
 	PR fortran/30207
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 23163d5332d7..085898866e0d 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -1985,10 +1985,12 @@ gfc_conv_array_index_offset (gfc_se * se, gfc_ss_info * info, int dim, int i,
 
           /* Multiply the loop variable by the stride and delta.  */
 	  index = se->loop->loopvar[i];
-	  index = fold_build2 (MULT_EXPR, gfc_array_index_type, index,
-			       info->stride[i]);
-	  index = fold_build2 (PLUS_EXPR, gfc_array_index_type, index,
-			       info->delta[i]);
+	  if (!integer_onep (info->stride[i]))
+	    index = fold_build2 (MULT_EXPR, gfc_array_index_type, index,
+				 info->stride[i]);
+	  if (!integer_zerop (info->delta[i]))
+	    index = fold_build2 (PLUS_EXPR, gfc_array_index_type, index,
+				 info->delta[i]);
 	  break;
 
 	default:
@@ -2006,7 +2008,8 @@ gfc_conv_array_index_offset (gfc_se * se, gfc_ss_info * info, int dim, int i,
     }
 
   /* Multiply by the stride.  */
-  index = fold_build2 (MULT_EXPR, gfc_array_index_type, index, stride);
+  if (!integer_onep (stride))
+    index = fold_build2 (MULT_EXPR, gfc_array_index_type, index, stride);
 
   return index;
 }