diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-01-04 23:16:10 +0100 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-01-05 13:04:44 +0100 |
| commit | 5ec390b478ec20d11fab41065a4e90fb0ecd74fc (patch) | |
| tree | 835a7666ede95dc46eeb9de1fa304ed0810b4a56 /gcc | |
| parent | afae4a55ccaa0de95ea11e5f634084db6ab2f444 (diff) | |
| download | gcc-5ec390b478ec20d11fab41065a4e90fb0ecd74fc.zip gcc-5ec390b478ec20d11fab41065a4e90fb0ecd74fc.tar.gz gcc-5ec390b478ec20d11fab41065a4e90fb0ecd74fc.tar.bz2 | |
Fix CO_REDUCE with RESULT_IMAGE.
gcc/fortran/ChangeLog:
* trans-array.c (gfc_conv_ss_descriptor): Use correct ref.
* trans-intrinsic.c (trans_argument): Use gfc_conv_expr_reference.
* trans-decl.c (gfc_build_builtin_function_decls):
Correct spec for array.
libgfortran/ChangeLog:
* caf_shared/collective_subroutine.c (collsub_reduce_array):
Fix off by one error for result.
gcc/testsuite/ChangeLog:
* gfortran.dg/caf-shared/co_reduce_1.f90: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/trans-array.c | 3 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/caf-shared/co_reduce_1.f90 | 24 |
4 files changed, 27 insertions, 4 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 199bcae..85ef153 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -3120,7 +3120,6 @@ gfc_conv_ss_descriptor (stmtblock_t * block, gfc_ss * ss, int base) gfc_ss_info *ss_info; gfc_array_info *info; tree tmp; - gfc_ref *ref; ss_info = ss->info; info = &ss_info->data.array; @@ -3172,7 +3171,7 @@ gfc_conv_ss_descriptor (stmtblock_t * block, gfc_ss * ss, int base) if (flag_coarray == GFC_FCOARRAY_SHARED) { - gfc_ref *co_ref = cas_impl_this_image_ref (ref); + gfc_ref *co_ref = cas_impl_this_image_ref (ss_info->expr->ref); if (co_ref) tmp = cas_add_this_image_offset (tmp, se.expr, &co_ref->u.ar, true); } diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 3ecd63d..f86f391 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -4187,7 +4187,7 @@ gfc_build_builtin_function_decls (void) gfor_fndecl_cas_reduce_array = gfc_build_library_function_decl_with_spec ( - get_identifier (PREFIX("cas_collsub_reduce_array")), ". W r r w w . ", + get_identifier (PREFIX("cas_collsub_reduce_array")), ". w r r w w . ", void_type_node, 6, pvoid_type_node /* desc. */, build_pointer_type (build_function_type_list (void_type_node, pvoid_type_node, pvoid_type_node, NULL_TREE)) /* assign function. */, diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 13c3295..92cdb3e 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -11217,7 +11217,7 @@ trans_argument (gfc_actual_arglist **curr_al, stmtblock_t *blk, if (expr->rank > 0) gfc_conv_expr_descriptor (argse, expr); else - gfc_conv_expr (argse, expr); + gfc_conv_expr_reference (argse, expr); gfc_add_block_to_block (blk, &argse->pre); gfc_add_block_to_block (postblk, &argse->post); diff --git a/gcc/testsuite/gfortran.dg/caf-shared/co_reduce_1.f90 b/gcc/testsuite/gfortran.dg/caf-shared/co_reduce_1.f90 new file mode 100644 index 0000000..ab8b287 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/caf-shared/co_reduce_1.f90 @@ -0,0 +1,24 @@ +! { dg-do run } +! { dg-set-target-env-var GFORTRAN_NUM_IMAGES "4" } +! This test only works with four images, it will fail otherwise. +program main + implicit none + integer, parameter :: n = 3 + integer, dimension(n) :: a + a = [1,2,3] + this_image() + call co_reduce (a, mysum, result_image = 2) + if (this_image () == 2) then + if (any(a /= [14,18,22])) then + print *,a + print *,a /= [14,18,22] + print *,any(a /= [14,18,22]) + stop 1 + end if + end if +contains + PURE FUNCTION mysum (lhs,rhs) + integer, intent(in) :: lhs, rhs + integer :: mysum + mysum = lhs + rhs + END FUNCTION mysum +end program main |