From dec77c83525963fd6ea50bddfa39ed5fd99ca34e Mon Sep 17 00:00:00 2001 From: ams Date: Fri, 21 Sep 2018 11:25:54 +0000 Subject: [PATCH] Fix co-array allocation The Fortran front-end has a bug in which it uses "int" values for "size_t" parameters. I don't know why this isn't problem for all 64-bit architectures, but GCN ends up with the data in the wrong argument register and/or stack slot, and bad things happen. This patch corrects the issue by setting the correct type. 2018-09-21 Andrew Stubbs Kwok Cheung Yeung gcc/fortran/ * trans-expr.c (gfc_trans_structure_assign): Ensure that the first argument of a call to _gfortran_caf_register is of size_type_node. * trans-intrinsic.c (conv_intrinsic_event_query): Convert computed index to a size_type_node type. * trans-stmt.c (gfc_trans_event_post_wait): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@264468 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 9 +++++++++ gcc/fortran/trans-expr.c | 2 +- gcc/fortran/trans-intrinsic.c | 5 ++++- gcc/fortran/trans-stmt.c | 4 +++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dbd05d2b23e..1f622495d09 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2018-09-21 Andrew Stubbs + Kwok Cheung Yeung + + * trans-expr.c (gfc_trans_structure_assign): Ensure that the first + argument of a call to _gfortran_caf_register is of size_type_node. + * trans-intrinsic.c (conv_intrinsic_event_query): Convert computed + index to a size_type_node type. + * trans-stmt.c (gfc_trans_event_post_wait): Likewise. + 2018-09-20 Allan Sandfeld Jensen * gfortranspec.c (lang_specific_driver): Handle -r like -nostdlib. diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 5a7cdb8f519..1f94dcf11dd 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -7733,7 +7733,7 @@ gfc_trans_structure_assign (tree dest, gfc_expr * expr, bool init, bool coarray) suffices to recognize the data as array. */ if (rank < 0) rank = 1; - size = integer_zero_node; + size = build_zero_cst (size_type_node); desc = field; gfc_add_modify (&block, gfc_conv_descriptor_rank (desc), build_int_cst (signed_char_type_node, rank)); diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index d068e011f25..11fd4b94fcc 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -10729,7 +10729,9 @@ conv_intrinsic_event_query (gfc_code *code) tmp = fold_build2_loc (input_location, MULT_EXPR, integer_type_node, extent, tmp); index = fold_build2_loc (input_location, PLUS_EXPR, - integer_type_node, index, tmp); + gfc_array_index_type, index, + fold_convert (gfc_array_index_type, + tmp)); if (i < ar->dimen - 1) { ubound = gfc_conv_descriptor_ubound_get (desc, gfc_rank_cst[i]); @@ -10753,6 +10755,7 @@ conv_intrinsic_event_query (gfc_code *code) stat = gfc_create_var (integer_type_node, "stat"); } + index = fold_convert (size_type_node, index); tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_event_query, 5, token, index, image_index, count ? gfc_build_addr_expr (NULL, count) : count, diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 795d3cc0a13..92d9c3767c0 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -1096,7 +1096,8 @@ gfc_trans_event_post_wait (gfc_code *code, gfc_exec_op op) tmp = fold_build2_loc (input_location, MULT_EXPR, integer_type_node, extent, tmp); index = fold_build2_loc (input_location, PLUS_EXPR, - integer_type_node, index, tmp); + gfc_array_index_type, index, + fold_convert (gfc_array_index_type, tmp)); if (i < ar->dimen - 1) { ubound = gfc_conv_descriptor_ubound_get (desc, gfc_rank_cst[i]); @@ -1130,6 +1131,7 @@ gfc_trans_event_post_wait (gfc_code *code, gfc_exec_op op) stat = gfc_create_var (integer_type_node, "stat"); } + index = fold_convert (size_type_node, index); if (op == EXEC_EVENT_POST) tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_event_post, 6, token, index, image_index, -- 2.11.4.GIT