diff options
| author | Mikael Morin <mikael.morin@sfr.fr> | 2011-10-07 22:26:11 +0200 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2011-10-07 20:26:11 +0000 |
| commit | d7baf647899d1919a313fd27ed6271bea77a1cc2 (patch) | |
| tree | efac8b31e6f6c7744e9653f42bfac4a5a35aebb4 /gcc/fortran/trans-array.c | |
| parent | 677e2daebff2bde08d013511f34db6a56ab5f774 (diff) | |
| download | gcc-d7baf647899d1919a313fd27ed6271bea77a1cc2.zip gcc-d7baf647899d1919a313fd27ed6271bea77a1cc2.tar.gz gcc-d7baf647899d1919a313fd27ed6271bea77a1cc2.tar.bz2 | |
trans-array.c (gfc_walk_variable_expr): Remove scalar coarray handling.
* trans-array.c (gfc_walk_variable_expr): Remove scalar coarray
handling. Don't reset array ref's corank and codimensions' types
in the full array ref case. Update loop upper limit.
Remove DIMEN_THIS_IMAGE case. Remove unnecessary conditions.
From-SVN: r179691
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index fa05d2b..87d5200 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -7612,12 +7612,6 @@ gfc_walk_variable_expr (gfc_ss * ss, gfc_expr * expr) ar = &ref->u.ar; - if (ar->as->rank == 0 && ref->next != NULL) - { - /* Scalar coarray. */ - continue; - } - switch (ar->type) { case AR_ELEMENT: @@ -7632,7 +7626,6 @@ gfc_walk_variable_expr (gfc_ss * ss, gfc_expr * expr) /* Make sure array is the same as array(:,:), this way we don't need to special case all the time. */ ar->dimen = ar->as->rank; - ar->codimen = 0; for (n = 0; n < ar->dimen; n++) { ar->dimen_type[n] = DIMEN_RANGE; @@ -7641,14 +7634,6 @@ gfc_walk_variable_expr (gfc_ss * ss, gfc_expr * expr) gcc_assert (ar->end[n] == NULL); gcc_assert (ar->stride[n] == NULL); } - for (n = ar->dimen; n < ar->dimen + ar->as->corank; n++) - { - newss->data.info.dim[n] = n; - ar->dimen_type[n] = DIMEN_RANGE; - - gcc_assert (ar->start[n] == NULL); - gcc_assert (ar->end[n] == NULL); - } ss = newss; break; @@ -7657,14 +7642,12 @@ gfc_walk_variable_expr (gfc_ss * ss, gfc_expr * expr) newss->data.info.ref = ref; /* We add SS chains for all the subscripts in the section. */ - for (n = 0; n < ar->dimen + ar->codimen; n++) + for (n = 0; n < ar->dimen; n++) { gfc_ss *indexss; switch (ar->dimen_type[n]) { - case DIMEN_THIS_IMAGE: - continue; case DIMEN_ELEMENT: /* Add SS for elemental (scalar) subscripts. */ gcc_assert (ar->start[n]); @@ -7677,8 +7660,7 @@ gfc_walk_variable_expr (gfc_ss * ss, gfc_expr * expr) /* We don't add anything for sections, just remember this dimension for later. */ newss->data.info.dim[newss->data.info.dimen] = n; - if (n < ar->dimen) - newss->data.info.dimen++; + newss->data.info.dimen++; break; case DIMEN_VECTOR: @@ -7689,8 +7671,7 @@ gfc_walk_variable_expr (gfc_ss * ss, gfc_expr * expr) indexss->loop_chain = gfc_ss_terminator; newss->data.info.subscript[n] = indexss; newss->data.info.dim[newss->data.info.dimen] = n; - if (n < ar->dimen) - newss->data.info.dimen++; + newss->data.info.dimen++; break; default: |