diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-07-04 22:25:28 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-07-04 22:25:28 +0200 |
| commit | d7463e5b31fdabbd5dea5a9d62d26049538119d5 (patch) | |
| tree | 9b639f2bcc6747c5eb2d446c0a24b47efea7b0e3 /gcc/fortran/trans-expr.c | |
| parent | 5a908485ae78349d22fc353a64563c0ab5e3eb16 (diff) | |
| download | gcc-d7463e5b31fdabbd5dea5a9d62d26049538119d5.zip gcc-d7463e5b31fdabbd5dea5a9d62d26049538119d5.tar.gz gcc-d7463e5b31fdabbd5dea5a9d62d26049538119d5.tar.bz2 | |
resolve.c (resolve_assoc_var): Fix corank setting.
2014-07-04 Tobias Burnus <burnus@net-b.de>
* resolve.c (resolve_assoc_var): Fix corank setting.
* trans-array.c (gfc_conv_descriptor_token): Change assert.
for select-type temporaries.
* trans-decl.c (generate_coarray_sym_init): Skip for
attr.select_type_temporary.
* trans-expr.c (gfc_conv_procedure_call): Fix for
select-type temporaries.
* trans-intrinsic.c (get_caf_token_offset): Ditto.
(gfc_conv_intrinsic_caf_get, gfc_conv_intrinsic_caf_send): Set
the correct dtype.
* trans-types.h (gfc_get_dtype_rank_type): New.
* trans-types.c (gfc_get_dtype_rank_type): Ditto.
2014-07-04 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/coarray/coindexed_3.f90: New.
From-SVN: r212299
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 7ee0206..dba51b0 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -4813,7 +4813,8 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, caf_type = TREE_TYPE (caf_decl); if (GFC_DESCRIPTOR_TYPE_P (caf_type) - && GFC_TYPE_ARRAY_AKIND (caf_type) == GFC_ARRAY_ALLOCATABLE) + && (GFC_TYPE_ARRAY_AKIND (caf_type) == GFC_ARRAY_ALLOCATABLE + || GFC_TYPE_ARRAY_AKIND (caf_type) == GFC_ARRAY_POINTER)) tmp = gfc_conv_descriptor_token (caf_decl); else if (DECL_LANG_SPECIFIC (caf_decl) && GFC_DECL_TOKEN (caf_decl) != NULL_TREE) |