|
 |
64f0ad |
2020-09-28 Jakub Jelinek <jakub@redhat.com>
|
|
|
64f0ad |
|
|
|
64f0ad |
Revert:
|
|
|
64f0ad |
2020-09-27 Steven G. Kargl <kargl@gcc.gnu.org>
|
|
|
64f0ad |
Mark Eggleston <markeggleston@gcc.gnu.org>
|
|
|
64f0ad |
|
|
|
64f0ad |
PR fortran/95614
|
|
|
64f0ad |
* decl.c (gfc_get_common): Use gfc_match_common_name instead
|
|
|
64f0ad |
of match_common_name.
|
|
|
64f0ad |
* decl.c (gfc_bind_idents): Use gfc_match_common_name instead
|
|
|
64f0ad |
of match_common_name.
|
|
|
64f0ad |
* match.c : Rename match_common_name to gfc_match_common_name.
|
|
|
64f0ad |
* match.c (gfc_match_common): Use gfc_match_common_name instead
|
|
|
64f0ad |
of match_common_name.
|
|
|
64f0ad |
* match.h : Rename match_common_name to gfc_match_common_name.
|
|
|
64f0ad |
* resolve.c (resolve_common_vars): Check each symbol in a
|
|
|
64f0ad |
common block has a global symbol. If there is a global symbol
|
|
|
64f0ad |
issue an error if the symbol type is known as is not a common
|
|
|
64f0ad |
block name.
|
|
|
64f0ad |
|
|
|
64f0ad |
--- gcc/fortran/decl.c
|
|
|
64f0ad |
+++ gcc/fortran/decl.c
|
|
|
64f0ad |
@@ -5789,7 +5789,7 @@ get_bind_c_idents (void)
|
|
|
64f0ad |
found_id = MATCH_YES;
|
|
|
64f0ad |
gfc_get_ha_symbol (name, &tmp_sym);
|
|
|
64f0ad |
}
|
|
|
64f0ad |
- else if (gfc_match_common_name (name) == MATCH_YES)
|
|
|
64f0ad |
+ else if (match_common_name (name) == MATCH_YES)
|
|
|
64f0ad |
{
|
|
|
64f0ad |
found_id = MATCH_YES;
|
|
|
64f0ad |
com_block = gfc_get_common (name, 0);
|
|
|
64f0ad |
@@ -5834,7 +5834,7 @@ get_bind_c_idents (void)
|
|
|
64f0ad |
found_id = MATCH_YES;
|
|
|
64f0ad |
gfc_get_ha_symbol (name, &tmp_sym);
|
|
|
64f0ad |
}
|
|
|
64f0ad |
- else if (gfc_match_common_name (name) == MATCH_YES)
|
|
|
64f0ad |
+ else if (match_common_name (name) == MATCH_YES)
|
|
|
64f0ad |
{
|
|
|
64f0ad |
found_id = MATCH_YES;
|
|
|
64f0ad |
com_block = gfc_get_common (name, 0);
|
|
|
64f0ad |
--- gcc/fortran/match.c
|
|
|
64f0ad |
+++ gcc/fortran/match.c
|
|
|
64f0ad |
@@ -5028,8 +5028,7 @@ gfc_get_common (const char *name, int from_module)
|
|
|
64f0ad |
|
|
|
64f0ad |
/* Match a common block name. */
|
|
|
64f0ad |
|
|
|
64f0ad |
-match
|
|
|
64f0ad |
-gfc_match_common_name (char *name)
|
|
|
64f0ad |
+match match_common_name (char *name)
|
|
|
64f0ad |
{
|
|
|
64f0ad |
match m;
|
|
|
64f0ad |
|
|
|
64f0ad |
@@ -5073,7 +5072,7 @@ gfc_match_common (void)
|
|
|
64f0ad |
|
|
|
64f0ad |
for (;;)
|
|
|
64f0ad |
{
|
|
|
64f0ad |
- m = gfc_match_common_name (name);
|
|
|
64f0ad |
+ m = match_common_name (name);
|
|
|
64f0ad |
if (m == MATCH_ERROR)
|
|
|
64f0ad |
goto cleanup;
|
|
|
64f0ad |
|
|
|
64f0ad |
--- gcc/fortran/match.h
|
|
|
64f0ad |
+++ gcc/fortran/match.h
|
|
|
64f0ad |
@@ -103,9 +103,11 @@ match gfc_match_call (void);
|
|
|
64f0ad |
|
|
|
64f0ad |
/* We want to use this function to check for a common-block-name
|
|
|
64f0ad |
that can exist in a bind statement, so removed the "static"
|
|
|
64f0ad |
- declaration of the function in match.c. */
|
|
|
64f0ad |
+ declaration of the function in match.c.
|
|
|
64f0ad |
|
|
|
64f0ad |
-match gfc_match_common_name (char *name);
|
|
|
64f0ad |
+ TODO: should probably rename this now that it'll be globally seen to
|
|
|
64f0ad |
+ gfc_match_common_name. */
|
|
|
64f0ad |
+match match_common_name (char *name);
|
|
|
64f0ad |
|
|
|
64f0ad |
match gfc_match_common (void);
|
|
|
64f0ad |
match gfc_match_block_data (void);
|
|
|
64f0ad |
--- gcc/fortran/resolve.c
|
|
|
64f0ad |
+++ gcc/fortran/resolve.c
|
|
|
64f0ad |
@@ -932,16 +932,9 @@ static void
|
|
|
64f0ad |
resolve_common_vars (gfc_common_head *common_block, bool named_common)
|
|
|
64f0ad |
{
|
|
|
64f0ad |
gfc_symbol *csym = common_block->head;
|
|
|
64f0ad |
- gfc_gsymbol *gsym;
|
|
|
64f0ad |
|
|
|
64f0ad |
for (; csym; csym = csym->common_next)
|
|
|
64f0ad |
{
|
|
|
64f0ad |
- gsym = gfc_find_gsymbol (gfc_gsym_root, csym->name);
|
|
|
64f0ad |
- if (gsym && gsym->type != GSYM_UNKNOWN && gsym->type != GSYM_COMMON)
|
|
|
64f0ad |
- gfc_error_now ("Global entity %qs at %L cannot appear in a "
|
|
|
64f0ad |
- "COMMON block at %L", gsym->name,
|
|
|
64f0ad |
- &gsym->where, &csym->common_block->where);
|
|
|
64f0ad |
-
|
|
|
64f0ad |
/* gfc_add_in_common may have been called before, but the reported errors
|
|
|
64f0ad |
have been ignored to continue parsing.
|
|
|
64f0ad |
We do the checks again here. */
|