diff options
author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-07 12:46:18 +0000 |
---|---|---|
committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-07 12:46:18 +0000 |
commit | be1bfb343306deced0606ff973da15eb69580411 (patch) | |
tree | b37e5a976d269b3995d6bf2d0549805071b660ed /gcc/fortran/trans.c | |
parent | e70e3d44d8263e37888e735aebcb0b5a990b1407 (diff) | |
download | gcc-be1bfb343306deced0606ff973da15eb69580411.tar.gz |
2011-07-07 Tobias Burnus <burnus@net-b.de>
* trans.c (gfc_allocate_with_status): Call _gfortran_caf_register
with NULL arguments for (new) stat=/errmsg= arguments.
2011-07-07 Tobias Burnus <burnus@net-b.de>
* libcaf.h (__attribute__, unlikely, likely): New macros.
(caf_register_t): Update comment.
(_gfortran_caf_register): Add stat, errmsg, errmsg_len arguments.
* single.c (_gfortran_caf_register): Ditto; add error diagnostics.
* mpi.c (_gfortran_caf_register): Ditto.
(caf_is_finalized): New global variable.
(_gfortran_caf_finalize): Use it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175966 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/trans.c')
-rw-r--r-- | gcc/fortran/trans.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c index 683e3f1e48b..4043df287f1 100644 --- a/gcc/fortran/trans.c +++ b/gcc/fortran/trans.c @@ -622,13 +622,16 @@ gfc_allocate_with_status (stmtblock_t * block, tree size, tree status, gfc_add_modify (&alloc_block, res, fold_convert (prvoid_type_node, build_call_expr_loc (input_location, - gfor_fndecl_caf_register, 3, + gfor_fndecl_caf_register, 6, fold_build2_loc (input_location, MAX_EXPR, size_type_node, size, build_int_cst (size_type_node, 1)), build_int_cst (integer_type_node, GFC_CAF_COARRAY_ALLOC), - null_pointer_node))); /* Token */ + null_pointer_node, /* token */ + null_pointer_node, /* stat */ + null_pointer_node, /* errmsg, errmsg_len */ + build_int_cst (integer_type_node, 0)))); } else { |