aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-expr.c
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2011-01-31 23:51:59 +0100
committerJanus Weil <janus@gcc.gnu.org>2011-01-31 23:51:59 +0100
commit463ec8224b9fc5661646c4f8c9242c92ebb08f72 (patch)
treea8b4296e4e8b0e26e311a219c1b461f791761117 /gcc/fortran/trans-expr.c
parentf16072b6e873b66b7998ac2937b2e4d5b54ffbb3 (diff)
downloadgcc-463ec8224b9fc5661646c4f8c9242c92ebb08f72.zip
gcc-463ec8224b9fc5661646c4f8c9242c92ebb08f72.tar.gz
gcc-463ec8224b9fc5661646c4f8c9242c92ebb08f72.tar.bz2
re PR fortran/47455 ([OOP] internal compiler error: in fold_convert_loc, at fold-const.c:2028)
2011-01-31 Janus Weil <janus@gcc.gnu.org> PR fortran/47455 * trans-expr.c (gfc_conv_procedure_call): Handle procedure pointers with pointer or allocatable result. 2011-01-31 Janus Weil <janus@gcc.gnu.org> PR fortran/47455 * gfortran.dg/typebound_call_19.f03: New. From-SVN: r169455
Diffstat (limited to 'gcc/fortran/trans-expr.c')
-rw-r--r--gcc/fortran/trans-expr.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 9682802..b5b6d61 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -3606,10 +3606,9 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
x = f()
where f is pointer valued, we have to dereference the result. */
if (!se->want_pointer && !byref
- && (sym->attr.pointer || sym->attr.allocatable)
- && !gfc_is_proc_ptr_comp (expr, NULL))
- se->expr = build_fold_indirect_ref_loc (input_location,
- se->expr);
+ && ((!comp && (sym->attr.pointer || sym->attr.allocatable))
+ || (comp && (comp->attr.pointer || comp->attr.allocatable))))
+ se->expr = build_fold_indirect_ref_loc (input_location, se->expr);
/* f2c calling conventions require a scalar default real function to
return a double precision result. Convert this back to default