diff options
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 0034b49..0da1720 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5981,25 +5981,24 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) gfc_array_ref *ar = &info->ref->u.ar; codim = gfc_get_corank (expr); - for (n = ss->data.info.dimen; n < ss->data.info.dimen + codim - 1; - n++) + for (n = 0; n < codim - 1; n++) { /* Make sure we are not lost somehow. */ - gcc_assert (ar->dimen_type[n] == DIMEN_THIS_IMAGE); + gcc_assert (ar->dimen_type[n + ndim] == DIMEN_THIS_IMAGE); /* Make sure the call to gfc_conv_section_startstride won't generate unnecessary code to calculate stride. */ - gcc_assert (ar->stride[n] == NULL); + gcc_assert (ar->stride[n + ndim] == NULL); - gfc_conv_section_startstride (&loop, ss, n); - loop.from[n] = info->start[n]; - loop.to[n] = info->end[n]; + gfc_conv_section_startstride (&loop, ss, n + ndim); + loop.from[n + loop.dimen] = info->start[n + ndim]; + loop.to[n + loop.dimen] = info->end[n + ndim]; } - gcc_assert (n == ss->data.info.dimen + codim - 1); + gcc_assert (n == codim - 1); evaluate_bound (&loop.pre, info->start, ar->start, - info->descriptor, n, true); - loop.from[n] = info->start[n]; + info->descriptor, n + ndim, true); + loop.from[n + loop.dimen] = info->start[n + ndim]; } else codim = 0; |