From 9b15893c31a9fd926459123037c09b0ac64a5bd3 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 21 Jun 2019 20:24:01 +0000 Subject: re PR fortran/67884 (Missing error message on required allocatable attribute) 2019-06-21 Steven G. Kargl PR fortran/67884 * resolve.c (deferred_requirements) : Check only the result variable. (resolve_fl_procedure): Check deferred requirements on functions. 2019-06-21 Steven G. Kargl PR fortran/67884 * gfortran.dg/dummy_procedure_8.f90: Remove a test that is ... * gfortran.dg/pr67884.f90: ... covered here. New test. From-SVN: r272569 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 8 ++++++++ 2 files changed, 14 insertions(+) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6a3bd62..4289227 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2019-06-21 Steven G. Kargl + PR fortran/67884 + * resolve.c (deferred_requirements) : Check only the result variable. + (resolve_fl_procedure): Check deferred requirements on functions. + +2019-06-21 Steven G. Kargl + PR fortran/51991 * decl.c (gfc_match_save): If SAVE was not seen, return MATCH_NO instead issuing an error message and returning MATCH_ERROR. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index afa4e5c..af7078a 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -12388,6 +12388,10 @@ deferred_requirements (gfc_symbol *sym) || sym->attr.associate_var || sym->attr.omp_udr_artificial_var)) { + /* If a function has a result variable, only check the variable. */ + if (sym->result && sym->name != sym->result->name) + return true; + gfc_error ("Entity %qs at %L has a deferred type parameter and " "requires either the POINTER or ALLOCATABLE attribute", sym->name, &sym->declared_at); @@ -12598,6 +12602,10 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) && !resolve_fl_var_and_proc (sym, mp_flag)) return false; + /* Constraints on deferred type parameter. */ + if (!deferred_requirements (sym)) + return false; + if (sym->ts.type == BT_CHARACTER) { gfc_charlen *cl = sym->ts.u.cl; -- cgit v1.1