aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-array.c
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2011-10-08 10:18:51 +0000
committerPaul Thomas <pault@gcc.gnu.org>2011-10-08 10:18:51 +0000
commit30a390c8104f9530cd8721e699deecd823fc4e9c (patch)
treed83041e7329684cc9e5bb1640494f98255167e1d /gcc/fortran/trans-array.c
parent2758ee999024e2142f491114d4c256e7fcd51457 (diff)
downloadgcc-30a390c8104f9530cd8721e699deecd823fc4e9c.zip
gcc-30a390c8104f9530cd8721e699deecd823fc4e9c.tar.gz
gcc-30a390c8104f9530cd8721e699deecd823fc4e9c.tar.bz2
re PR fortran/47844 (Array stride ignored for pointer-valued function results)
2011-10-08 Paul Thomas <pault@gcc.gnu.org> PR fortran/47844 * trans-array.c (gfc_conv_array_index_offset): Use descriptor stride for pointer function results. 2011-10-08 Paul Thomas <pault@gcc.gnu.org> PR fortran/47844 * gfortran.dg/pointer_function_result_1.f90 : New test. From-SVN: r179710
Diffstat (limited to 'gcc/fortran/trans-array.c')
-rw-r--r--gcc/fortran/trans-array.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 79dbafa..b755670 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -2609,6 +2609,18 @@ gfc_conv_array_index_offset (gfc_se * se, gfc_ss_info * info, int dim, int i,
/* Temporary array or derived type component. */
gcc_assert (se->loop);
index = se->loop->loopvar[se->loop->order[i]];
+
+ /* Pointer functions can have stride[0] different from unity.
+ Use the stride returned by the function call and stored in
+ the descriptor for the temporary. */
+ if (se->ss && se->ss->type == GFC_SS_FUNCTION
+ && se->ss->expr
+ && se->ss->expr->symtree
+ && se->ss->expr->symtree->n.sym->result
+ && se->ss->expr->symtree->n.sym->result->attr.pointer)
+ stride = gfc_conv_descriptor_stride_get (info->descriptor,
+ gfc_rank_cst[dim]);
+
if (!integer_zerop (info->delta[dim]))
index = fold_build2_loc (input_location, PLUS_EXPR,
gfc_array_index_type, index, info->delta[dim]);