diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2016-02-14 15:13:39 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2016-02-14 15:13:39 +0000 |
| commit | b7c5658195b3e2c969159bb37ea804af840d41cc (patch) | |
| tree | 7a0f37f89c356f5979fcc7f90513c03420d3786b /gcc | |
| parent | 60cb4ef5550eac9581ef1b36607b5fb297eddce2 (diff) | |
| download | gcc-b7c5658195b3e2c969159bb37ea804af840d41cc.zip gcc-b7c5658195b3e2c969159bb37ea804af840d41cc.tar.gz gcc-b7c5658195b3e2c969159bb37ea804af840d41cc.tar.bz2 | |
re PR fortran/60526 (Accepts-invalid: Variable name same as type name)
2016-02-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/60526
PR bootstrap/69816
* decl.c (build_sym): Reverted previous patch.
2016-02-14 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/60526
PR bootstrap/69816
* gfortran.dg/type_decl_4.f90: Removed.
From-SVN: r233411
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/type_decl_4.f90 | 7 |
4 files changed, 12 insertions, 27 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5ef62ae..aa4a028 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,6 +1,12 @@ 2016-02-14 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/60526 + PR bootstrap/69816 + * decl.c (build_sym): Reverted previous patch. + +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. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index a31ea49..df81369 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1215,30 +1215,10 @@ 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 4b494b1..cc9e002 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,12 @@ 2016-02-14 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/60526 + PR bootstrap/69816 + * gfortran.dg/type_decl_4.f90: Removed. + +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> diff --git a/gcc/testsuite/gfortran.dg/type_decl_4.f90 b/gcc/testsuite/gfortran.dg/type_decl_4.f90 deleted file mode 100644 index 5c3ddb8..0000000 --- a/gcc/testsuite/gfortran.dg/type_decl_4.f90 +++ /dev/null @@ -1,7 +0,0 @@ -! { 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 |