From 03b2d3defa7ef8c258d48f4bfbd66a08c27ea19c Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Thu, 27 Dec 2018 21:13:53 +0000 Subject: re PR fortran/81027 (Assumed-shape array reported as deferred.) 2018-12-27 Steven G. Kargl PR fortran/81027 * expr.c (gfc_check_init_expr): Distinguish assumed-shape versus deferred-shape dummy arguments in an error message. 2018-12-27 Steven G. Kargl PR fortran/81027 * gfortran.dg/pr81027.f90: New test. * gfortran.dg/initialization_7.f90: Update error message. From-SVN: r267437 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/expr.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index af5467f..827cd96 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-12-27 Steven G. Kargl + + PR fortran/81027 + * expr.c (gfc_check_init_expr): Distinguish assumed-shape versus + deferred-shape dummy arguments in an error message. + 2018-12-26 Harald Anlauf PR fortran/85407 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 7a018ae..638b38d 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2869,9 +2869,16 @@ gfc_check_init_expr (gfc_expr *e) break; case AS_DEFERRED: - gfc_error ("Deferred array %qs at %L is not permitted " - "in an initialization expression", - e->symtree->n.sym->name, &e->where); + if (!e->symtree->n.sym->attr.allocatable + && !e->symtree->n.sym->attr.pointer + && e->symtree->n.sym->attr.dummy) + gfc_error ("Assumed-shape array %qs at %L is not permitted " + "in an initialization expression", + e->symtree->n.sym->name, &e->where); + else + gfc_error ("Deferred array %qs at %L is not permitted " + "in an initialization expression", + e->symtree->n.sym->name, &e->where); break; case AS_EXPLICIT: -- cgit v1.1