diff options
| author | Tobias Burnus <burnus@net-b.de> | 2011-07-07 14:46:18 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-07-07 14:46:18 +0200 |
| commit | 4054bc52d6c353aceeb7a9312347c2c98e837783 (patch) | |
| tree | b37e5a976d269b3995d6bf2d0549805071b660ed /gcc | |
| parent | 3c3ab6c5e1ef023b0c75a2dd36dc3c36cb840e33 (diff) | |
| download | gcc-4054bc52d6c353aceeb7a9312347c2c98e837783.zip gcc-4054bc52d6c353aceeb7a9312347c2c98e837783.tar.gz gcc-4054bc52d6c353aceeb7a9312347c2c98e837783.tar.bz2 | |
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>
* 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.
From-SVN: r175966
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 75693cc..267c81e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +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-06 Daniel Carrera <dcarrera@gmail.com> * trans-array.c (gfc_array_allocate): Rename allocatable_array to diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c index 683e3f1..4043df2 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 { |