diff options
| author | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-02-28 19:32:02 +0000 |
|---|---|---|
| committer | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-02-28 19:32:02 +0000 |
| commit | 3cb8bd451b4c2922d030109030c72a1b44de0c36 (patch) | |
| tree | 7ae4d178bd5f8caf8d86aef9b1854a7d68c18195 /gcc/fortran/resolve.c | |
| parent | b864c8b1f0ef5a1ecf1797ed118df518730bb16f (diff) | |
2017-02-28 Paul Thomas <pault@gcc.gnu.org>
PR fortran/79739
* resolve.c (resolve_fl_procedure): Deal with the case where
'submodule_name' is NULL so that gfc_error does not ICE.
Reformat the error message to make it more consistent.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@245787 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 876f3cd5d8c..37ffde820e0 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -12341,9 +12341,10 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) if (!gfc_check_result_characteristics (sym, iface, errmsg, 200)) { gfc_error ("%s between the MODULE PROCEDURE declaration " - "in module %s and the declaration at %L in " - "SUBMODULE %s", errmsg, module_name, - &sym->declared_at, submodule_name); + "in MODULE '%s' and the declaration at %L in " + "(SUB)MODULE '%s'", + errmsg, module_name, &sym->declared_at, + submodule_name ? submodule_name : module_name); return false; } |