diff options
| author | Andrew Stubbs <ams@codesourcery.com> | 2019-05-22 13:12:03 +0000 |
|---|---|---|
| committer | Andrew Stubbs <ams@gcc.gnu.org> | 2019-05-22 13:12:03 +0000 |
| commit | 0f09fc8a844c3e3a8c57fbb2152e51ae54004d4c (patch) | |
| tree | 0150cab929b3735403c0971b644080e2b82c0bf6 /gcc | |
| parent | 88a8126a906f32068724d87416eeb01971f37f35 (diff) | |
| download | gcc-0f09fc8a844c3e3a8c57fbb2152e51ae54004d4c.zip gcc-0f09fc8a844c3e3a8c57fbb2152e51ae54004d4c.tar.gz gcc-0f09fc8a844c3e3a8c57fbb2152e51ae54004d4c.tar.bz2 | |
Fix fortran size_type_node parameter passing.
2019-05-22 Andrew Stubbs <ams@codesourcery.com>
gcc/fortran/
* trans-stmt.c (gfc_trans_critical): Use size_type_node for
gfor_fndecl_caf_lock and gfor_fndecl_caf_unlock calls.
(gfc_trans_allocate): Use size_type_node for gfor_fndecl_caf_sync_all
call.
From-SVN: r271512
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-stmt.c | 13 |
2 files changed, 15 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f119e74..c3240f4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2019-05-22 Andrew Stubbs <ams@codesourcery.com> + + * trans-stmt.c (gfc_trans_critical): Use size_type_node for + gfor_fndecl_caf_lock and gfor_fndecl_caf_unlock calls. + (gfc_trans_allocate): Use size_type_node for gfor_fndecl_caf_sync_all + call. + 2019-05-22 Jeff Law <law@redhat.com> Mark Eggleston <mark.eggleston@codethink.com> diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 5fa182b..7c36563 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -1576,12 +1576,13 @@ gfc_trans_critical (gfc_code *code) if (flag_coarray == GFC_FCOARRAY_LIB) { + tree zero_size = build_zero_cst (size_type_node); token = gfc_get_symbol_decl (code->resolved_sym); token = GFC_TYPE_ARRAY_CAF_TOKEN (TREE_TYPE (token)); tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_lock, 7, - token, integer_zero_node, integer_one_node, + token, zero_size, integer_one_node, null_pointer_node, null_pointer_node, - null_pointer_node, integer_zero_node); + null_pointer_node, zero_size); gfc_add_expr_to_block (&block, tmp); /* It guarantees memory consistency within the same segment */ @@ -1601,10 +1602,11 @@ gfc_trans_critical (gfc_code *code) if (flag_coarray == GFC_FCOARRAY_LIB) { + tree zero_size = build_zero_cst (size_type_node); tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_unlock, 6, - token, integer_zero_node, integer_one_node, + token, zero_size, integer_one_node, null_pointer_node, null_pointer_node, - integer_zero_node); + zero_size); gfc_add_expr_to_block (&block, tmp); /* It guarantees memory consistency within the same segment */ @@ -6772,9 +6774,10 @@ gfc_trans_allocate (gfc_code * code) if (needs_caf_sync) { /* Add a sync all after the allocation has been executed. */ + tree zero_size = build_zero_cst (size_type_node); tmp = build_call_expr_loc (input_location, gfor_fndecl_caf_sync_all, 3, null_pointer_node, null_pointer_node, - integer_zero_node); + zero_size); gfc_add_expr_to_block (&post, tmp); } |