diff options
| author | Tobias Burnus <burnus@net-b.de> | 2011-07-21 14:00:25 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-07-21 14:00:25 +0200 |
| commit | 0c53708eadd727f4089028e09840865db25a3cd9 (patch) | |
| tree | 90e38bf99a56bacbccf1b030246599e15eccdf02 /gcc/fortran/trans-array.c | |
| parent | 91bc61122f0f6781805aab89e21f674b218c72c9 (diff) | |
| download | gcc-0c53708eadd727f4089028e09840865db25a3cd9.zip gcc-0c53708eadd727f4089028e09840865db25a3cd9.tar.gz gcc-0c53708eadd727f4089028e09840865db25a3cd9.tar.bz2 | |
check.c (gfc_check_present): Allow coarrays.
2011-07-21 Tobias Burnus <burnus@net-b.de>
* check.c (gfc_check_present): Allow coarrays.
* trans-array.c (gfc_conv_array_ref): Avoid casting
when a pointer is wanted.
* trans-decl.c (create_function_arglist): For -fcoarray=lib,
handle hidden token and offset arguments for nondescriptor
coarrays.
* trans-expr.c (get_tree_for_caf_expr): New function.
(gfc_conv_procedure_call): For -fcoarray=lib pass the
token and offset for nondescriptor coarray dummies.
* trans.h (lang_type): Add caf_offset tree.
(GFC_TYPE_ARRAY_CAF_OFFSET): New macro.
2011-07-21 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/coarray_lib_token_1.f90: New.
From-SVN: r176562
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 4ec892b..9caa17f 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -2631,10 +2631,11 @@ gfc_conv_array_ref (gfc_se * se, gfc_array_ref * ar, gfc_symbol * sym, if (GFC_ARRAY_TYPE_P (TREE_TYPE (se->expr)) && TREE_CODE (TREE_TYPE (se->expr)) == POINTER_TYPE) se->expr = build_fold_indirect_ref_loc (input_location, se->expr); - + /* Use the actual tree type and not the wrapped coarray. */ - se->expr = fold_convert (TYPE_MAIN_VARIANT (TREE_TYPE (se->expr)), - se->expr); + if (!se->want_pointer) + se->expr = fold_convert (TYPE_MAIN_VARIANT (TREE_TYPE (se->expr)), + se->expr); } return; |