aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/expr.c
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2014-02-19 12:52:39 +0100
committerJanus Weil <janus@gcc.gnu.org>2014-02-19 12:52:39 +0100
commit1251a8be603722c2bf1c894c987cfe2f724d1568 (patch)
treee5c4bbf0826117aa74b28f32f66bd01e9eecd6c6 /gcc/fortran/expr.c
parent476b301a0c62213400f5208c55a2a0f1120790ce (diff)
downloadgcc-1251a8be603722c2bf1c894c987cfe2f724d1568.zip
gcc-1251a8be603722c2bf1c894c987cfe2f724d1568.tar.gz
gcc-1251a8be603722c2bf1c894c987cfe2f724d1568.tar.bz2
re PR fortran/60232 ([OOP] The rank of the element in the structure constructor does not match that of the component)
2014-02-19 Janus Weil <janus@gcc.gnu.org> PR fortran/60232 * expr.c (gfc_get_variable_expr): Don't add REF_ARRAY for dimensionful functions, which are used as procedure pointer target. 2014-02-19 Janus Weil <janus@gcc.gnu.org> PR fortran/60232 * gfortran.dg/typebound_proc_33.f90: New. From-SVN: r207896
Diffstat (limited to 'gcc/fortran/expr.c')
-rw-r--r--gcc/fortran/expr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index fe6eab5..fe92c53a 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -3972,9 +3972,10 @@ gfc_get_variable_expr (gfc_symtree *var)
e->symtree = var;
e->ts = var->n.sym->ts;
- if ((var->n.sym->as != NULL && var->n.sym->ts.type != BT_CLASS)
- || (var->n.sym->ts.type == BT_CLASS && CLASS_DATA (var->n.sym)
- && CLASS_DATA (var->n.sym)->as))
+ if (var->n.sym->attr.flavor != FL_PROCEDURE
+ && ((var->n.sym->as != NULL && var->n.sym->ts.type != BT_CLASS)
+ || (var->n.sym->ts.type == BT_CLASS && CLASS_DATA (var->n.sym)
+ && CLASS_DATA (var->n.sym)->as)))
{
e->rank = var->n.sym->ts.type == BT_CLASS
? CLASS_DATA (var->n.sym)->as->rank : var->n.sym->as->rank;