diff options
| author | Tobias Burnus <burnus@net-b.de> | 2018-10-16 20:37:08 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2018-10-16 20:37:08 +0200 |
| commit | c152593057a3315c3e11343efb2717d5fa8b5df0 (patch) | |
| tree | 494f41ed69baffeea88852147f7a3958480cd6ee /gcc/fortran/trans-array.c | |
| parent | 91ab2a1d6e137c2eaa6f8f5966b611bca700ef96 (diff) | |
| download | gcc-c152593057a3315c3e11343efb2717d5fa8b5df0.zip gcc-c152593057a3315c3e11343efb2717d5fa8b5df0.tar.gz gcc-c152593057a3315c3e11343efb2717d5fa8b5df0.tar.bz2 | |
Fix bounds with ALLOCATE with source-expr
PR fortran/67125
* trans-array.c (gfc_array_init_size, gfc_array_allocate):
Rename argument e3_is_array_constr to e3_has_nodescriptor
and update comments.
* trans-stmt.c (gfc_trans_allocate): Also fix lower bound
to 1 for nonalloc/nonpointer func results/vars besides
array constructors.
PR fortran/67125
* gfortran.dg/allocate_with_source_26.f90: New.
From-SVN: r265212
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index c4df4eb..ea4cf8c 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5333,7 +5333,7 @@ gfc_array_init_size (tree descriptor, int rank, int corank, tree * poffset, gfc_expr ** lower, gfc_expr ** upper, stmtblock_t * pblock, stmtblock_t * descriptor_block, tree * overflow, tree expr3_elem_size, tree *nelems, gfc_expr *expr3, - tree expr3_desc, bool e3_is_array_constr, gfc_expr *expr) + tree expr3_desc, bool e3_has_nodescriptor, gfc_expr *expr) { tree type; tree tmp; @@ -5412,10 +5412,11 @@ gfc_array_init_size (tree descriptor, int rank, int corank, tree * poffset, gfc_init_se (&se, NULL); if (expr3_desc != NULL_TREE) { - if (e3_is_array_constr) - /* The lbound of a constant array [] starts at zero, but when - allocating it, the standard expects the array to start at - one. */ + if (e3_has_nodescriptor) + /* The lbound of nondescriptor arrays like array constructors, + nonallocatable/nonpointer function results/variables, + start at zero, but when allocating it, the standard expects + the array to start at one. */ se.expr = gfc_index_one_node; else se.expr = gfc_conv_descriptor_lbound_get (expr3_desc, @@ -5451,12 +5452,13 @@ gfc_array_init_size (tree descriptor, int rank, int corank, tree * poffset, gfc_init_se (&se, NULL); if (expr3_desc != NULL_TREE) { - if (e3_is_array_constr) + if (e3_has_nodescriptor) { - /* The lbound of a constant array [] starts at zero, but when - allocating it, the standard expects the array to start at - one. Therefore fix the upper bound to be - (desc.ubound - desc.lbound)+ 1. */ + /* The lbound of nondescriptor arrays like array constructors, + nonallocatable/nonpointer function results/variables, + start at zero, but when allocating it, the standard expects + the array to start at one. Therefore fix the upper bound to be + (desc.ubound - desc.lbound) + 1. */ tmp = fold_build2_loc (input_location, MINUS_EXPR, gfc_array_index_type, gfc_conv_descriptor_ubound_get ( @@ -5684,7 +5686,7 @@ bool gfc_array_allocate (gfc_se * se, gfc_expr * expr, tree status, tree errmsg, tree errlen, tree label_finish, tree expr3_elem_size, tree *nelems, gfc_expr *expr3, tree e3_arr_desc, - bool e3_is_array_constr) + bool e3_has_nodescriptor) { tree tmp; tree pointer; @@ -5813,7 +5815,7 @@ gfc_array_allocate (gfc_se * se, gfc_expr * expr, tree status, tree errmsg, &offset, lower, upper, &se->pre, &set_descriptor_block, &overflow, expr3_elem_size, nelems, expr3, e3_arr_desc, - e3_is_array_constr, expr); + e3_has_nodescriptor, expr); if (dimension) { |