re PR fortran/60526 (Accepts-invalid: Variable name same as type name)

2016-02-14  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/60526
	* decl.c (build_sym):  If the name has already been defined as a
	type, issue error and return false.

2016-02-14  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/60526
	* gfortran.dg/type_decl_4.f90:  New test.

From-SVN: r233410

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index de669e03d2c3b5c6ebe1cb3d8f243b66c97d77dc..5ef62ae57e36426df70ec9b5955783a66f2ab47d 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/60526
+       * decl.c (build_sym):  If the name has already been defined as a
+       type, issue error and return false.
+
 2016-02-12  David Malcolm  <dmalcolm@redhat.com>
 
        PR other/69554

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index df813697a0251389e4b4611f75cd63e6648d1441..a31ea490bcf8bf38caebdfd563a33604fb8f9332 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1215,10 +1215,30 @@ build_sym (const char *name, gfc_charlen *cl, bool cl_deferred,
 {
   symbol_attribute attr;
   gfc_symbol *sym;
+  int nlen;
+  char u_name[GFC_MAX_SYMBOL_LEN + 1];
+  gfc_symtree *st;
 
   if (gfc_get_symbol (name, NULL, &sym))
     return false;
 
+  /* Check if the name has already been defined as a type.  The
+     first letter of the symtree will be in upper case then.  */
+
+  nlen = strlen(name);
+  gcc_assert (nlen <= GFC_MAX_SYMBOL_LEN);
+  strncpy (u_name, name, nlen + 1);
+  u_name[0] = TOUPPER(u_name[0]);
+
+  st = gfc_find_symtree (gfc_current_ns->sym_root, u_name);
+
+  if (st != 0)
+    {
+      gfc_error ("Symbol %qs at %C also declared as a type at %L", name,
+                &st->n.sym->declared_at);
+      return false;
+    }
+
   /* Start updating the symbol table.  Add basic type attribute if present.  */
   if (current_ts.type != BT_UNKNOWN
       && (sym->attr.implicit_type == 0

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e5dff736dca1dd398a134ffc06a3e4f47869868..4b494b13717edbaec542f9a9f2c9772ae96aa2d3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/60526
+       * gfortran.dg/type_decl_4.f90:  New test.
+
 2016-02-14  Alan Modra  <amodra@gmail.com>
 
        PR testsuite/68886

diff --git a/gcc/testsuite/gfortran.dg/type_decl_4.f90 b/gcc/testsuite/gfortran.dg/type_decl_4.f90
new file mode 100644 (file)
index 0000000..5c3ddb8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/type_decl_4.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+program main
+  type Xx ! { dg-error "Symbol 'xx' at .1. also declared as a type at .2." }
+  end type Xx
+  real :: Xx  ! { dg-error "Symbol 'xx' at .1. also declared as a type at .2." }
+  
+end program main