FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/79739 (ICE with some interesting code)

Browse source 
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.

From-SVN: r245787
This commit is contained in:
Paul Thomas 2017-02-28 19:32:02 +00:00
parent 2af0c3edd1
commit 753721a542
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View file

@ -1,3 +1,10 @@
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.
2017-02-28 Jakub Jelinek <jakub@redhat.com>
* parse.c (parse_critical_block): Use cond ? G_("...") : G_("...")

7
gcc/fortran/resolve.c
View file

@ -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;
}