diff mbox

[Fortran] Fix atomic_ref with -fcoarray=lib

Message ID 53C4112D.9020309@net-b.de
State New
Headers show

Commit Message

Tobias Burnus July 14, 2014, 5:19 p.m. UTC 
If the atomic_ref VALUE argument is of a different kind than the ATOM 
argument, the result was wrong with -fcoarray=lib. That showed up with 
gfortran.dg/coarray/atomic_1.f90 - but for some reasons only with -m32.

The fix is to create a temporary variable in this case, what the patch does.
OK for the trunk?

Tobias

Comments

Paul Richard Thomas July 14, 2014, 8:03 p.m. UTC | #1 
Dear Tobias,

It looks OK to me - good for trunk

Thanks for the patch

Paul

On 14 July 2014 19:19, Tobias Burnus <burnus@net-b.de> wrote:
> If the atomic_ref VALUE argument is of a different kind than the ATOM
> argument, the result was wrong with -fcoarray=lib. That showed up with
> gfortran.dg/coarray/atomic_1.f90 - but for some reasons only with -m32.
>
> The fix is to create a temporary variable in this case, what the patch does.
> OK for the trunk?
>
> Tobias
diff mbox

Patch

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

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

diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 57b7f4d..3de0b09 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -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);
     }