diff mbox

[fortran,18/66] inline sum and product: Interfaces changes: get_array_ref_dim

Message ID 20111027233020.18581.19957@gimli.local
State New
Headers show

Commit Message

Mikael Morin Oct. 27, 2011, 11:30 p.m. UTC 
Same as previous patch, get_array_ref_dim uses dimensions and thus needs
a gfc_ss struct as argument.
OK?
2011-10-19  Mikael Morin  <mikael@gcc.gnu.org>

	* trans-array.c (get_array_ref_dim): Change argument type and name.
	Obtain previous argument from the new argument in the body.
	(gfc_trans_create_temp_arry, gfc_conv_loop_setup): Update calls.
diff mbox

Patch

diff --git a/trans-array.c b/trans-array.c
index 6af4fd6..eeed8bb 100644
--- a/trans-array.c
+++ b/trans-array.c
@@ -807,9 +807,12 @@  gfc_trans_allocate_array_storage (stmtblock_t * pre, stmtblock_t * post,
    */
 
 static int
-get_array_ref_dim (gfc_ss_info *info, int loop_dim)
+get_array_ref_dim (gfc_ss *ss, int loop_dim)
 {
   int n, array_dim, array_ref_dim;
+  gfc_ss_info *info;
+
+  info = &ss->data.info;
 
   array_ref_dim = 0;
   array_dim = info->dim[loop_dim];
@@ -884,7 +887,7 @@  gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post,
 	 to the n'th dimension of the array. We need to reconstruct loop infos
 	 in the right order before using it to set the descriptor
 	 bounds.  */
-      tmp_dim = get_array_ref_dim (info, n);
+      tmp_dim = get_array_ref_dim (ss, n);
       from[tmp_dim] = loop->from[n];
       to[tmp_dim] = loop->to[n];
 
@@ -3976,7 +3979,7 @@  gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where)
 	  && INTEGER_CST_P (info->stride[dim]))
 	{
 	  loop->from[n] = info->start[dim];
-	  mpz_set (i, cshape[get_array_ref_dim (info, n)]);
+	  mpz_set (i, cshape[get_array_ref_dim (loopspec[n], n)]);
 	  mpz_sub_ui (i, i, 1);
 	  /* To = from + (size - 1) * stride.  */
 	  tmp = gfc_conv_mpz_to_tree (i, gfc_index_integer_kind);