Revert "Fortran : ICE in build_field PR95614"

This reverts commit e5a76af3a2f3324efc60b4b2778ffb29d5c377bc.

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 9bfaa60418a9cdfb4edf7efb4f593e121d9847a5..326e6f5db7aeed29ab44a80de61a5f4ce466ac27 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -6007,7 +6007,7 @@ get_bind_c_idents (void)
       found_id = MATCH_YES;
       gfc_get_ha_symbol (name, &tmp_sym);
     }
-  else if (gfc_match_common_name (name) == MATCH_YES)
+  else if (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 (gfc_match_common_name (name) == MATCH_YES)
+         else if (match_common_name (name) == MATCH_YES)
            {
              found_id = MATCH_YES;
              com_block = gfc_get_common (name, 0);

diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index bee73e7b00800e7e1e816d953a68d1e51b522e2d..cb09c5f8ec535d8fedd14b3a5585350dc0a74e73 100644 (file)
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -5166,8 +5166,7 @@ gfc_get_common (const char *name, int from_module)
 
 /* Match a common block name.  */
 
-match
-gfc_match_common_name (char *name)
+match match_common_name (char *name)
 {
   match m;
 
@@ -5219,7 +5218,7 @@ gfc_match_common (void)
 
   for (;;)
     {
-      m = gfc_match_common_name (name);
+      m = match_common_name (name);
       if (m == MATCH_ERROR)
        goto cleanup;
 

diff --git a/gcc/fortran/match.h b/gcc/fortran/match.h
index 4ccb5961d2b1d8d8c18cf29232e5ad09ed1834fb..7bf70d77016e672c45d131129a87f9648c71ad43 100644 (file)
--- a/gcc/fortran/match.h
+++ b/gcc/fortran/match.h
@@ -103,9 +103,11 @@ 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.
  
-match gfc_match_common_name (char *name);
+   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 (void);
 match gfc_match_block_data (void);

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 3c767a7c490274564ec1cafb6c067e839a3b2569..f4ce49f84323b425cd283714653b34df95a4c998 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -936,16 +936,9 @@ 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.  */

diff --git a/gcc/testsuite/gfortran.dg/pr95614_1.f90 b/gcc/testsuite/gfortran.dg/pr95614_1.f90
deleted file mode 100644 (file)
index f835143..0000000
--- a/gcc/testsuite/gfortran.dg/pr95614_1.f90
+++ /dev/null
@@ -1,6 +0,0 @@
-! { dg-do compile }
-
-module m   ! { dg-error ".1." }
-  common m ! { dg-error "cannot appear in a COMMON" }
-end
-

diff --git a/gcc/testsuite/gfortran.dg/pr95614_2.f90 b/gcc/testsuite/gfortran.dg/pr95614_2.f90
deleted file mode 100644 (file)
index 9d69a50..0000000
--- a/gcc/testsuite/gfortran.dg/pr95614_2.f90
+++ /dev/null
@@ -1,6 +0,0 @@
-! { dg-do compile }
-
-module m        ! { dg-error ".1." }
-  common /xc/ m ! { dg-error "cannot appear in a COMMON" }
-end
-