diff options
| author | Tobias Burnus <burnus@net-b.de> | 2013-12-08 22:34:18 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2013-12-08 22:34:18 +0100 |
| commit | 019c0e5dc17205c2a7f302ff83943cb1c3444237 (patch) | |
| tree | c24718e86ac3e1f8ea95e40a465df924edf2cfb0 /gcc/fortran/resolve.c | |
| parent | ae29d0253f8333b228e24c6202f567ee9dca8da9 (diff) | |
| download | gcc-019c0e5dc17205c2a7f302ff83943cb1c3444237.zip gcc-019c0e5dc17205c2a7f302ff83943cb1c3444237.tar.gz gcc-019c0e5dc17205c2a7f302ff83943cb1c3444237.tar.bz2 | |
re PR fortran/58099 ([F03] over-zealous procedure-pointer error checking)
2013-12-08 Tobias Burnus <burnus@net-b.de>
Janus Weil <janus@gcc.gnu.org>
PR fortran/58099
PR fortran/58676
PR fortran/41724
* resolve.c (gfc_resolve_intrinsic): Set elemental/pure.
(resolve_fl_procedure): Reject pure dummy procedures/procedure
pointers.
(gfc_explicit_interface_required): Don't require a
match of ELEMENTAL for intrinsics.
2013-12-08 Tobias Burnus <burnus@net-b.de>
PR fortran/58099
PR fortran/58676
PR fortran/41724
* gfortran.dg/elemental_subroutine_8.f90: New.
* gfortran.dg/proc_decl_9.f90: Add ELEMENTAL to make valid.
* gfortran.dg/proc_ptr_11.f90: Ditto.
* gfortran.dg/proc_ptr_result_8.f90: Ditto.
* gfortran.dg/proc_ptr_32.f90: Update dg-error.
* gfortran.dg/proc_ptr_33.f90: Ditto.
* gfortran.dg/proc_ptr_result_1.f90: Add abstract interface
which is not elemental.
* gfortran.dg/proc_ptr_result_7.f90: Ditto.
Co-Authored-By: Janus Weil <janus@gcc.gnu.org>
From-SVN: r205791
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5ed7053..ea46324 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -1679,6 +1679,9 @@ gfc_resolve_intrinsic (gfc_symbol *sym, locus *loc) gfc_copy_formal_args_intr (sym, isym); + sym->attr.pure = isym->pure; + sym->attr.elemental = isym->elemental; + /* Check it is actually available in the standard settings. */ if (!gfc_check_intrinsic_standard (isym, &symstd, false, sym->declared_at)) { @@ -2314,7 +2317,7 @@ gfc_explicit_interface_required (gfc_symbol *sym, char *errmsg, int err_len) } } - if (sym->attr.elemental) /* (4) */ + if (sym->attr.elemental && !sym->attr.intrinsic) /* (4) */ { strncpy (errmsg, _("elemental procedure"), err_len); return true; @@ -11094,6 +11097,23 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) sym->name, &sym->declared_at); } + /* F2008, C1218. */ + if (sym->attr.elemental) + { + if (sym->attr.proc_pointer) + { + gfc_error ("Procedure pointer '%s' at %L shall not be elemental", + sym->name, &sym->declared_at); + return false; + } + if (sym->attr.dummy) + { + gfc_error ("Dummy procedure '%s' at %L shall not be elemental", + sym->name, &sym->declared_at); + return false; + } + } + if (sym->attr.is_bind_c && sym->attr.is_c_interop != 1) { gfc_formal_arglist *curr_arg; |