aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-expr.c
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2014-06-25 22:26:42 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2014-06-25 22:26:42 +0200
commitaa9ca5ca4f3e9e272a7dcc518d037927b319bb27 (patch)
treea15b037bed16a18aeac9a00c6147d44c259deb02 /gcc/fortran/trans-expr.c
parentdb88b449589fa989c1f72e4796d2bce291b6cedf (diff)
downloadgcc-aa9ca5ca4f3e9e272a7dcc518d037927b319bb27.zip
gcc-aa9ca5ca4f3e9e272a7dcc518d037927b319bb27.tar.gz
gcc-aa9ca5ca4f3e9e272a7dcc518d037927b319bb27.tar.bz2
check.c (check_co_minmaxsum): Add definable check.
gcc/fortran/ 2014-06-25 Tobias Burnus <burnus@net-b.de> * check.c (check_co_minmaxsum): Add definable check. * expr.c (gfc_check_vardef_context): Fix context == NULL case. * trans-expr.c (get_scalar_to_descriptor_type): Handle pointer arguments. * trans-intrinsic.c (gfc_conv_intrinsic_caf_get): Fix generation of temporary strings. gcc/testsuite/ 2014-06-25 Tobias Burnus <burnus@net-b.de> * gfortran.dg/coarray_collectives_7.f90: New. From-SVN: r211992
Diffstat (limited to 'gcc/fortran/trans-expr.c')
-rw-r--r--gcc/fortran/trans-expr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index d67d737..7ee0206 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -57,6 +57,8 @@ get_scalar_to_descriptor_type (tree scalar, symbol_attribute attr)
else
akind = GFC_ARRAY_ASSUMED_SHAPE_CONT;
+ if (POINTER_TYPE_P (TREE_TYPE (scalar)))
+ scalar = TREE_TYPE (scalar);
return gfc_get_array_type_bounds (TREE_TYPE (scalar), 0, 0, NULL, NULL, 1,
akind, !(attr.pointer || attr.target));
}