| Message ID | 20150706145823.7e58cba2@vepi2 |
|---|---|
| State | New |
| Headers | show |
Dear Andre, Whilst it is probably OK in most circumstances, I would change: s/rank_remap = ss->dimen < ndim/rank_remap = ss->dimen < ndim != 0 Apart from that, it is indeed OK for trunk, in spite of your expectations :-) Thanks for the patch Paul On 6 July 2015 at 14:58, Andre Vehreschild <vehre@gmx.de> wrote: > Hi all, > > this is a proposal to patch PR 66578 > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66578 . It extends work of Mikael > Morin. The patch fixes two issues: > > 1. a source'd allocate in a block: allocate(c, source=a(:)). The issues occurs > because due to the new handling of source-expressions in trans_allocate() an > array descriptor is created where previously just a plain array was used. I.e., > GFC_DESCRIPTOR_TYPE_P (source) is true now and GFC_ARRAY_TYPE_P (source) false, > which made gfortran use the wrong bounds for the descriptor (zero-based instead > of one-based). This was fixed by Mikael's proposal. > > 2. a two-level array addressing lead to a segfault. I.e., when in a > source-expression an array was used to index another object, then the offset > was computed incorrectly. > > Bootstraps and regtests fine on x86_64-linux-gnu/f21. > > Comments welcome! > > Regards, > Andre > > PS: Experience shows that asking whether this ok for trunk is useless ;-) There > is always something that could be improved. Open for suggestions. > -- > Andre Vehreschild * Email: vehre ad gmx dot de
Hi Paul, Thanks for the review, but I don't understand the regexp. rank_remap = ss->dimen < ndim != 0 in my eyes is not a legal expression. Did you mean something like rank_remap = ss->dimen < ndim && ndim != 0, or the like? Regards, Andre Am 6. Juli 2015 21:36:18 MESZ, schrieb Paul Richard Thomas <paul.richard.thomas@gmail.com>: >Dear Andre, > >Whilst it is probably OK in most circumstances, I would change: >s/rank_remap = ss->dimen < ndim/rank_remap = ss->dimen < ndim != 0 > >Apart from that, it is indeed OK for trunk, in spite of your >expectations :-) > >Thanks for the patch > >Paul > >On 6 July 2015 at 14:58, Andre Vehreschild <vehre@gmx.de> wrote: >> Hi all, >> >> this is a proposal to patch PR 66578 >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66578 . It extends work >of Mikael >> Morin. The patch fixes two issues: >> >> 1. a source'd allocate in a block: allocate(c, source=a(:)). The >issues occurs >> because due to the new handling of source-expressions in >trans_allocate() an >> array descriptor is created where previously just a plain array was >used. I.e., >> GFC_DESCRIPTOR_TYPE_P (source) is true now and GFC_ARRAY_TYPE_P >(source) false, >> which made gfortran use the wrong bounds for the descriptor >(zero-based instead >> of one-based). This was fixed by Mikael's proposal. >> >> 2. a two-level array addressing lead to a segfault. I.e., when in a >> source-expression an array was used to index another object, then the >offset >> was computed incorrectly. >> >> Bootstraps and regtests fine on x86_64-linux-gnu/f21. >> >> Comments welcome! >> >> Regards, >> Andre >> >> PS: Experience shows that asking whether this ok for trunk is useless >;-) There >> is always something that could be improved. Open for suggestions. >> -- >> Andre Vehreschild * Email: vehre ad gmx dot de
Andre, Forget my comment. I was seeing arrows all pointing in one direction ! Cheers Paul On 6 July 2015 at 21:42, Andre Vehreschild <vehre@gmx.de> wrote: > Hi Paul, > > Thanks for the review, but I don't understand the regexp. rank_remap = ss->dimen < ndim != 0 in my eyes is not a legal expression. Did you mean something like rank_remap = ss->dimen < ndim && ndim != 0, or the like? > > Regards, > Andre > > Am 6. Juli 2015 21:36:18 MESZ, schrieb Paul Richard Thomas <paul.richard.thomas@gmail.com>: >>Dear Andre, >> >>Whilst it is probably OK in most circumstances, I would change: >>s/rank_remap = ss->dimen < ndim/rank_remap = ss->dimen < ndim != 0 >> >>Apart from that, it is indeed OK for trunk, in spite of your >>expectations :-) >> >>Thanks for the patch >> >>Paul >> >>On 6 July 2015 at 14:58, Andre Vehreschild <vehre@gmx.de> wrote: >>> Hi all, >>> >>> this is a proposal to patch PR 66578 >>> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66578 . It extends work >>of Mikael >>> Morin. The patch fixes two issues: >>> >>> 1. a source'd allocate in a block: allocate(c, source=a(:)). The >>issues occurs >>> because due to the new handling of source-expressions in >>trans_allocate() an >>> array descriptor is created where previously just a plain array was >>used. I.e., >>> GFC_DESCRIPTOR_TYPE_P (source) is true now and GFC_ARRAY_TYPE_P >>(source) false, >>> which made gfortran use the wrong bounds for the descriptor >>(zero-based instead >>> of one-based). This was fixed by Mikael's proposal. >>> >>> 2. a two-level array addressing lead to a segfault. I.e., when in a >>> source-expression an array was used to index another object, then the >>offset >>> was computed incorrectly. >>> >>> Bootstraps and regtests fine on x86_64-linux-gnu/f21. >>> >>> Comments welcome! >>> >>> Regards, >>> Andre >>> >>> PS: Experience shows that asking whether this ok for trunk is useless >>;-) There >>> is always something that could be improved. Open for suggestions. >>> -- >>> Andre Vehreschild * Email: vehre ad gmx dot de > > -- > Andre Vehreschild * Kreuzherrenstr. 8 * 52062 Aachen > Mail: vehre@gmx.de * Tel.: +49 241 9291018
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index fece3ab..afea5ec 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6912,9 +6912,10 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) tree from; tree to; tree base; - bool onebased = false; + bool onebased = false, rank_remap; ndim = info->ref ? info->ref->u.ar.dimen : ss->dimen; + rank_remap = ss->dimen < ndim; if (se->want_coarray) { @@ -6947,6 +6948,22 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) if (expr->ts.type == BT_CHARACTER) se->string_length = gfc_get_expr_charlen (expr); + /* If we have an array section or are assigning make sure that + the lower bound is 1. References to the full + array should otherwise keep the original bounds. */ + if ((!info->ref || info->ref->u.ar.type != AR_FULL) && !se->want_pointer) + for (dim = 0; dim < loop.dimen; dim++) + if (!integer_onep (loop.from[dim])) + { + tmp = fold_build2_loc (input_location, MINUS_EXPR, + gfc_array_index_type, gfc_index_one_node, + loop.from[dim]); + loop.to[dim] = fold_build2_loc (input_location, PLUS_EXPR, + gfc_array_index_type, + loop.to[dim], tmp); + loop.from[dim] = gfc_index_one_node; + } + desc = info->descriptor; if (se->direct_byref && !se->byref_noassign) { @@ -7040,20 +7057,6 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) from = loop.from[dim]; to = loop.to[dim]; - /* If we have an array section or are assigning make sure that - the lower bound is 1. References to the full - array should otherwise keep the original bounds. */ - if ((!info->ref - || info->ref->u.ar.type != AR_FULL) - && !integer_onep (from)) - { - tmp = fold_build2_loc (input_location, MINUS_EXPR, - gfc_array_index_type, gfc_index_one_node, - from); - to = fold_build2_loc (input_location, PLUS_EXPR, - gfc_array_index_type, to, tmp); - from = gfc_index_one_node; - } onebased = integer_onep (from); gfc_conv_descriptor_lbound_set (&loop.pre, parm, gfc_rank_cst[dim], from); @@ -7079,7 +7082,7 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) { tmp = gfc_conv_array_lbound (desc, n); tmp = fold_build2_loc (input_location, MINUS_EXPR, - TREE_TYPE (base), tmp, loop.from[dim]); + TREE_TYPE (base), tmp, from); tmp = fold_build2_loc (input_location, MULT_EXPR, TREE_TYPE (base), tmp, gfc_conv_array_stride (desc, n)); @@ -7114,7 +7117,19 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) /* Force the offset to be -1, when the lower bound of the highest dimension is one and the symbol is present and is not a pointer/allocatable or associated. */ - if (onebased && se->use_offset + if (((se->direct_byref || GFC_ARRAY_TYPE_P (TREE_TYPE (desc))) + && !se->data_not_needed) + || (se->use_offset && base != NULL_TREE)) + { + /* Set the offset depending on base. */ + tmp = rank_remap && !se->direct_byref ? + fold_build2_loc (input_location, PLUS_EXPR, + gfc_array_index_type, base, + offset) + : base; + gfc_conv_descriptor_offset_set (&loop.pre, parm, tmp); + } + else if (onebased && (!rank_remap || se->use_offset) && expr->symtree && !(expr->symtree->n.sym && expr->symtree->n.sym->ts.type == BT_CLASS && !CLASS_DATA (expr->symtree->n.sym)->attr.class_pointer) @@ -7129,11 +7144,6 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) tmp = gfc_conv_mpz_to_tree (minus_one, gfc_index_integer_kind); gfc_conv_descriptor_offset_set (&loop.pre, parm, tmp); } - else if (((se->direct_byref || GFC_ARRAY_TYPE_P (TREE_TYPE (desc))) - && !se->data_not_needed) - || (se->use_offset && base != NULL_TREE)) - /* Set the offset depending on base. */ - gfc_conv_descriptor_offset_set (&loop.pre, parm, base); else { /* Only the callee knows what the correct offset it, so just set diff --git a/gcc/testsuite/gfortran.dg/allocate_with_source_9.f08 b/gcc/testsuite/gfortran.dg/allocate_with_source_9.f08 new file mode 100644 index 0000000..aa7cb47 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/allocate_with_source_9.f08 @@ -0,0 +1,29 @@ +! { dg-do run } +! +! Contributed by Thomas Koenig <tkoenig@gcc.gnu.org>, +! Andre Vehreschild <vehre@gcc.gnu.org> + +program main + + type T + integer, allocatable :: acc(:) + end type + + integer :: n, lb, ub + integer :: vec(9) + type(T) :: o1, o2 + vec = [(i, i= 1, 9)] + n = 42 + lb = 7 + ub = lb + 2 + allocate(o1%acc, source=vec) + allocate(o2%acc, source=o1%acc(lb:ub)) + if (any (o2%acc /= [7, 8, 9])) call abort() + block + real, dimension(0:n) :: a + real, dimension(:), allocatable :: c + call random_number(a) + allocate(c,source=a(:)) + if (any (abs(a - c) > 1E-6)) call abort() + end block +end program main