diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-11-18 16:35:12 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-11-18 16:35:12 +0000 |
| commit | f86aea04aa5f5adb151473c738f2827ec52665c7 (patch) | |
| tree | 51b77ebaab1959061a8ea69ccc3d628c2212051f /gcc/fortran | |
| parent | cbb0f5f65e4c484917eeecd741aa50137e5d47fe (diff) | |
| download | gcc-f86aea04aa5f5adb151473c738f2827ec52665c7.tar.gz | |
2007-11-18 Tobias Burnus <burnus@net-b.de>
PR fortran/34137
* primary.c (match_variable): Reject non-result entry symbols.
* resolve.c (resolve_contained_fntype): Do not check entry
* master functions.
2007-11-18 Tobias Burnus <burnus@net-b.de>
PR fortran/34137
* gfortran.dg/entry_14.f90: New.
* gfortran.dg/entry_15.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130270 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/primary.c | 3 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 526d89c450e..f95ca6688a8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2007-11-18 Tobias Burnus <burnus@net-b.de> + + PR fortran/34137 + * primary.c (match_variable): Reject non-result entry symbols. + * resolve.c (resolve_contained_fntype): Do not check entry master + functions. + 2007-11-17 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> * trans-types.c (gfc_init_types): Use wider buffer. diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index d5e4b64d26e..7e3d539ba16 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -2525,8 +2525,7 @@ match_variable (gfc_expr **result, int equiv_flag, int host_flag) case FL_PROCEDURE: /* Check for a nonrecursive function result */ - if (sym->attr.function && (sym->result == sym || sym->attr.entry) - && !sym->attr.external) + if (sym->attr.function && sym->result == sym && !sym->attr.external) { /* If a function result is a derived type, then the derived type may still have to be resolved. */ diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 586d601985f..0d5e36ea046 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -284,8 +284,10 @@ resolve_contained_fntype (gfc_symbol *sym, gfc_namespace *ns) { try t; - /* If this namespace is not a function, ignore it. */ - if (! sym || !(sym->attr.function || sym->attr.flavor == FL_VARIABLE)) + /* If this namespace is not a function or an entry master function, + ignore it. */ + if (! sym || !(sym->attr.function || sym->attr.flavor == FL_VARIABLE) + || sym->attr.entry_master) return; /* Try to find out of what the return type is. */ |