procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix co-array allocation

Browse source 
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  <ams@codesourcery.com>
            Kwok Cheung Yeung  <kcy@codesourcery.com>

	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.

Co-Authored-By: Kwok Cheung Yeung <kcy@codesourcery.com>

From-SVN: r264468
This commit is contained in:
Andrew Stubbs 2018-09-21 11:25:54 +00:00 • committed by Andrew Stubbs
parent b6895597cd
commit cbd29d0eae
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gcc/fortran/ChangeLog
View file

@ -1,3 +1,12 @@
2018-09-21 Andrew Stubbs <ams@codesourcery.com>
Kwok Cheung Yeung <kcy@codesourcery.com>
* 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 <allan.jensen@qt.io>
* gfortranspec.c (lang_specific_driver): Handle -r like -nostdlib.

2
gcc/fortran/trans-expr.c
View file

@ -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));

5
gcc/fortran/trans-intrinsic.c
View file

@ -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,

4
gcc/fortran/trans-stmt.c
View file

@ -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,