OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trans-intrinsic.c (conv_intrinsic_atomic_ref): Fix handling for kind mismatch with -fcoarray=lib. 

2014-06-14  Tobias Burnus  <burnus@net-b.de>

        * trans-intrinsic.c (conv_intrinsic_atomic_ref): Fix handling
        for kind mismatch with -fcoarray=lib.

From-SVN: r212525
This commit is contained in:
Tobias Burnus 2014-07-14 22:40:12 +02:00 committed by Tobias Burnus
parent d110c52ee3
commit d4b29c1370
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,3 +1,8 @@
2014-06-14 Tobias Burnus <burnus@net-b.de>
* trans-intrinsic.c (conv_intrinsic_atomic_ref): Fix handling
for kind mismatch with -fcoarray=lib.
2014-07-12 Paul Thomas <pault@gcc.gnu.org>
PR fortran/61780

15
gcc/fortran/trans-intrinsic.c
View File

@ -8563,7 +8563,8 @@ conv_intrinsic_atomic_ref (gfc_code *code)
atom = argse.expr;
gfc_init_se (&argse, NULL);
if (gfc_option.coarray == GFC_FCOARRAY_LIB)
if (gfc_option.coarray == GFC_FCOARRAY_LIB
&& code->ext.actual->expr->ts.kind == atom_expr->ts.kind)
argse.want_pointer = 1;
gfc_conv_expr (&argse, code->ext.actual->expr);
gfc_add_block_to_block (&block, &argse.pre);
@ -8589,6 +8590,7 @@ conv_intrinsic_atomic_ref (gfc_code *code)
if (gfc_option.coarray == GFC_FCOARRAY_LIB)
{
tree image_index, caf_decl, offset, token;
tree orig_value = NULL_TREE, vardecl = NULL_TREE;
caf_decl = gfc_get_tree_for_caf_expr (atom_expr);
if (TREE_CODE (TREE_TYPE (caf_decl)) == REFERENCE_TYPE)
@ -8601,6 +8603,14 @@ conv_intrinsic_atomic_ref (gfc_code *code)
get_caf_token_offset (&token, &offset, caf_decl, atom, atom_expr);
/* Different type, need type conversion. */
if (!POINTER_TYPE_P (TREE_TYPE (value)))
{
vardecl = gfc_create_var (TREE_TYPE (TREE_TYPE (atom)), "value");
orig_value = value;
value = gfc_build_addr_expr (NULL_TREE, vardecl);
}
tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_atomic_ref, 7,
token, offset, image_index, value, stat,
build_int_cst (integer_type_node,
@ -8608,6 +8618,9 @@ conv_intrinsic_atomic_ref (gfc_code *code)
build_int_cst (integer_type_node,
(int) atom_expr->ts.kind));
gfc_add_expr_to_block (&block, tmp);
if (vardecl != NULL_TREE)
gfc_add_modify (&block, orig_value,
fold_convert (TREE_TYPE (orig_value), vardecl));
gfc_add_block_to_block (&block, &post_block);
return gfc_finish_block (&block);
}