diff options
| author | Jeff Law <law@redhat.com> | 2011-11-30 05:16:36 +0000 |
|---|---|---|
| committer | Jeff Law <law@redhat.com> | 2011-11-30 05:16:36 +0000 |
| commit | 7b5177cc9956a68a50825c443a6d396fdc1af2b5 (patch) | |
| tree | a6b80dca8f72a2e7640e4d535901e42325b2a954 /gcc/fortran/trans-array.c | |
| parent | 6377b0d9b395f395e25bd4a030a9056171433061 (diff) | |
| parent | ee4a734e5eece9824adc2a26e518c99bbdbe802e (diff) | |
Weekly merge from trunk. No regressions.reload-v2a
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/reload-v2a@181834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 262743d0d37..ee8f89693b4 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -1087,7 +1087,7 @@ gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post, gfc_ss * ss, for (s = ss; s; s = s->parent) for (n = 0; n < s->loop->dimen; n++) { - dim = get_scalarizer_dim_for_array_dim (ss, ss->dim[n]); + dim = get_scalarizer_dim_for_array_dim (ss, s->dim[n]); /* For a callee allocated array express the loop bounds in terms of the descriptor fields. */ @@ -4341,9 +4341,9 @@ set_loop_bounds (gfc_loopinfo *loop) } /* Transform everything so we have a simple incrementing variable. */ - if (n < loop->dimen && integer_onep (info->stride[dim])) + if (integer_onep (info->stride[dim])) info->delta[dim] = gfc_index_zero_node; - else if (n < loop->dimen) + else { /* Set the delta for this section. */ info->delta[dim] = gfc_evaluate_now (loop->from[n], &loop->pre); @@ -5027,6 +5027,11 @@ gfc_conv_array_initializer (tree type, gfc_expr * expr) tree index, range; VEC(constructor_elt,gc) *v = NULL; + if (expr->expr_type == EXPR_VARIABLE + && expr->symtree->n.sym->attr.flavor == FL_PARAMETER + && expr->symtree->n.sym->value) + expr = expr->symtree->n.sym->value; + switch (expr->expr_type) { case EXPR_CONSTANT: |