Fortran : ICE in build_field PR95614

Local identifiers can not be the same as a module name.  Original
patch by Steve Kargl resulted in name clashes between common block
names and local identifiers.  A local identifier can be the same as
a global identier if that identifier represents a common.  The patch
was modified to allow global identifiers that represent a common
block.

2020-09-27  Steven G. Kargl  <kargl@gcc.gnu.org>
	    Mark Eggleston  <markeggleston@gcc.gnu.org>

gcc/fortran/

	PR fortran/95614
	* decl.c (gfc_get_common): Use gfc_match_common_name instead
	of match_common_name.
	* decl.c (gfc_bind_idents): Use gfc_match_common_name instead
	of match_common_name.
	* match.c : Rename match_common_name to gfc_match_common_name.
	* match.c (gfc_match_common): Use gfc_match_common_name instead
	of match_common_name.
	* match.h : Rename match_common_name to gfc_match_common_name.
	* resolve.c (resolve_common_vars): Check each symbol in a
	common block has a global symbol.  If there is a global symbol
	issue an error if the symbol type is known as is not a common
	block name.

2020-09-27  Mark Eggleston  <markeggleston@gcc.gnu.org>

gcc/testsuite/

	PR fortran/95614
	* gfortran.dg/pr95614_1.f90: New test.
	* gfortran.dg/pr95614_2.f90: New test.
This commit is contained in:
Mark Eggleston 2020-06-11 14:33:51 +01:00
parent 683e55facf
commit e5a76af3a2
6 changed files with 26 additions and 8 deletions

View File

@ -6007,7 +6007,7 @@ get_bind_c_idents (void)
found_id = MATCH_YES;
gfc_get_ha_symbol (name, &tmp_sym);
}
else if (match_common_name (name) == MATCH_YES)
else if (gfc_match_common_name (name) == MATCH_YES)
{
found_id = MATCH_YES;
com_block = gfc_get_common (name, 0);
@ -6052,7 +6052,7 @@ get_bind_c_idents (void)
found_id = MATCH_YES;
gfc_get_ha_symbol (name, &tmp_sym);
}
else if (match_common_name (name) == MATCH_YES)
else if (gfc_match_common_name (name) == MATCH_YES)
{
found_id = MATCH_YES;
com_block = gfc_get_common (name, 0);

View File

@ -5166,7 +5166,8 @@ gfc_get_common (const char *name, int from_module)
/* Match a common block name. */
match match_common_name (char *name)
match
gfc_match_common_name (char *name)
{
match m;
@ -5218,7 +5219,7 @@ gfc_match_common (void)
for (;;)
{
m = match_common_name (name);
m = gfc_match_common_name (name);
if (m == MATCH_ERROR)
goto cleanup;

View File

@ -103,11 +103,9 @@ match gfc_match_call (void);
/* We want to use this function to check for a common-block-name
that can exist in a bind statement, so removed the "static"
declaration of the function in match.c.
declaration of the function in match.c. */
TODO: should probably rename this now that it'll be globally seen to
gfc_match_common_name. */
match match_common_name (char *name);
match gfc_match_common_name (char *name);
match gfc_match_common (void);
match gfc_match_block_data (void);

View File

@ -936,9 +936,16 @@ static void
resolve_common_vars (gfc_common_head *common_block, bool named_common)
{
gfc_symbol *csym = common_block->head;
gfc_gsymbol *gsym;
for (; csym; csym = csym->common_next)
{
gsym = gfc_find_gsymbol (gfc_gsym_root, csym->name);
if (gsym && gsym->type != GSYM_UNKNOWN && gsym->type != GSYM_COMMON)
gfc_error_now ("Global entity %qs at %L cannot appear in a "
"COMMON block at %L", gsym->name,
&gsym->where, &csym->common_block->where);
/* gfc_add_in_common may have been called before, but the reported errors
have been ignored to continue parsing.
We do the checks again here. */

View File

@ -0,0 +1,6 @@
! { dg-do compile }
module m ! { dg-error ".1." }
common m ! { dg-error "cannot appear in a COMMON" }
end

View File

@ -0,0 +1,6 @@
! { dg-do compile }
module m ! { dg-error ".1." }
common /xc/ m ! { dg-error "cannot appear in a COMMON" }
end