diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2018-05-20 10:04:46 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2018-05-20 10:04:46 +0000 |
| commit | f82f425b56a1ccf1950c6d0992e7c106558acba0 (patch) | |
| tree | 1979e22abd5e448cee201ee6e3e3f4b88d8e102f /gcc/fortran/trans-intrinsic.c | |
| parent | 7c71e79664fbc04c3eb1d8b0307b33e502488664 (diff) | |
| download | gcc-f82f425b56a1ccf1950c6d0992e7c106558acba0.zip gcc-f82f425b56a1ccf1950c6d0992e7c106558acba0.tar.gz gcc-f82f425b56a1ccf1950c6d0992e7c106558acba0.tar.bz2 | |
re PR fortran/49636 ([F03] ASSOCIATE construct confused with slightly complicated case)
2018-05-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/49636
* trans-array.c (gfc_get_array_span): Renamed from
'get_array_span'.
(gfc_conv_expr_descriptor): Change references to above.
* trans-array.h : Add prototype for 'gfc_get_array_span'.
* trans-stmt.c (trans_associate_var): If the associate name is
a subref array pointer, use gfc_get_array_span for the span.
2018-05-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/49636
* gfortran.dg/associate_38.f90: New test.
From-SVN: r260414
Diffstat (limited to 'gcc/fortran/trans-intrinsic.c')
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 651a97f..fa01971 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -4966,7 +4966,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) else { tree ifbody2, elsebody2; - + /* We switch to > or >= depending on the value of the BACK argument. */ cond = gfc_create_var (logical_type_node, "cond"); @@ -7900,15 +7900,17 @@ gfc_conv_associated (gfc_se *se, gfc_expr *expr) logical_type_node, tmp, build_int_cst (TREE_TYPE (tmp), 0)); - /* A pointer to an array, call library function _gfor_associated. */ - arg1se.want_pointer = 1; - gfc_conv_expr_descriptor (&arg1se, arg1->expr); + /* A pointer to an array, call library function _gfor_associated. */ + arg1se.want_pointer = 1; + gfc_conv_expr_descriptor (&arg1se, arg1->expr); + gfc_add_block_to_block (&se->pre, &arg1se.pre); + gfc_add_block_to_block (&se->post, &arg1se.post); - arg2se.want_pointer = 1; - gfc_conv_expr_descriptor (&arg2se, arg2->expr); - gfc_add_block_to_block (&se->pre, &arg2se.pre); - gfc_add_block_to_block (&se->post, &arg2se.post); - se->expr = build_call_expr_loc (input_location, + arg2se.want_pointer = 1; + gfc_conv_expr_descriptor (&arg2se, arg2->expr); + gfc_add_block_to_block (&se->pre, &arg2se.pre); + gfc_add_block_to_block (&se->post, &arg2se.post); + se->expr = build_call_expr_loc (input_location, gfor_fndecl_associated, 2, arg1se.expr, arg2se.expr); se->expr = convert (logical_type_node, se->expr); |