diff options
| author | Tobias Burnus <burnus@net-b.de> | 2011-04-30 17:54:49 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-04-30 17:54:49 +0200 |
| commit | 4e2cf5f5f6bcd75b990df9100e69f044990d9f07 (patch) | |
| tree | 5ab8cab34416bd160510840ff567d9b1f98986c0 /gcc/fortran | |
| parent | 2e1df0f00b8625beab3858201673d470cae65687 (diff) | |
| download | gcc-4e2cf5f5f6bcd75b990df9100e69f044990d9f07.zip gcc-4e2cf5f5f6bcd75b990df9100e69f044990d9f07.tar.gz gcc-4e2cf5f5f6bcd75b990df9100e69f044990d9f07.tar.bz2 | |
re PR fortran/48800 (ICE with non-allocatable/pointer deferred-shape array)
2011-04-30 Tobias Burnus <burnus@net-b.de>
PR fortran/48800
* decl.c (gfc_match_import): Don't try to find the
symbol if already found.
2011-04-30 Tobias Burnus <burnus@net-b.de>
PR fortran/48800
* gfortran.dg/interface_37.f90: New.
From-SVN: r173219
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e5b8d31..07d7376 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-04-30 Tobias Burnus <burnus@net-b.de> + + PR fortran/48800 + * decl.c (gfc_match_import): Don't try to find the + symbol if already found. + 2011-04-30 Paul Thomas <pault@gcc.gnu.org> PR fortran/48746 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 9901fb1..dfbca29a 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2995,7 +2995,7 @@ gfc_match_import (void) gfc_error ("Type name '%s' at %C is ambiguous", name); return MATCH_ERROR; } - else if (gfc_current_ns->proc_name->ns->parent != NULL + else if (!sym && gfc_current_ns->proc_name->ns->parent != NULL && gfc_find_symbol (name, gfc_current_ns->proc_name->ns->parent, 1, &sym)) |