From ecc54e6eab98f1275218af1e7ed2c3aaa81ed456 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Mon, 18 Dec 2006 19:34:23 +0000 Subject: [PATCH] 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 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans-array.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a7e2607..7bf9577 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2006-12-18 Roger Sayle + + * trans-array.c (gfc_conv_array_index_offset): Avoid multiplying + index by one, or adding zero to it. + 2006-12-17 Roger Sayle PR fortran/30207 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 23163d5..0858988 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; } -- 2.7.4